Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Ohmyzsh
Commits
4fb50b33
Unverified
Commit
4fb50b33
authored
5 years ago
by
Marc Cornellà
Committed by
GitHub
5 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Unquote yes in conditional expressions for style consistency
parent
1f58cd92
master
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
plugins/gitfast/git-prompt.sh
+5
-5
plugins/gitfast/git-prompt.sh
with
5 additions
and
5 deletions
+5
-5
plugins/gitfast/git-prompt.sh
View file @
4fb50b33
...
@@ -219,7 +219,7 @@ __git_ps1_show_upstream ()
...
@@ -219,7 +219,7 @@ __git_ps1_show_upstream ()
if
[[
-n
"
$count
"
&&
-n
"
$name
"
]]
;
then
if
[[
-n
"
$count
"
&&
-n
"
$name
"
]]
;
then
__git_ps1_upstream_name
=
$(
git rev-parse
\
__git_ps1_upstream_name
=
$(
git rev-parse
\
--abbrev-ref
"
$upstream
"
2>/dev/null
)
--abbrev-ref
"
$upstream
"
2>/dev/null
)
if
[
"
$pcmode
"
=
"
yes
"
]
&&
[
"
$ps1_expanded
"
=
"
yes
"
]
;
then
if
[
"
$pcmode
"
=
yes
]
&&
[
"
$ps1_expanded
"
=
yes
]
;
then
p
=
"
$p
\$
{__git_ps1_upstream_name}"
p
=
"
$p
\$
{__git_ps1_upstream_name}"
else
else
p
=
"
$p
${
__git_ps1_upstream_name
}
"
p
=
"
$p
${
__git_ps1_upstream_name
}
"
...
@@ -508,13 +508,13 @@ __git_ps1 ()
...
@@ -508,13 +508,13 @@ __git_ps1 ()
# NO color option unless in PROMPT_COMMAND mode or it's Zsh
# NO color option unless in PROMPT_COMMAND mode or it's Zsh
if
[
-n
"
${
GIT_PS1_SHOWCOLORHINTS
-
}
"
]
;
then
if
[
-n
"
${
GIT_PS1_SHOWCOLORHINTS
-
}
"
]
;
then
if
[
"
$pcmode
"
=
"
yes
"
]
||
[
-n
"
${
ZSH_VERSION
-
}
"
]
;
then
if
[
"
$pcmode
"
=
yes
]
||
[
-n
"
${
ZSH_VERSION
-
}
"
]
;
then
__git_ps1_colorize_gitstring
__git_ps1_colorize_gitstring
fi
fi
fi
fi
b
=
${
b
##refs/heads/
}
b
=
${
b
##refs/heads/
}
if
[
"
$pcmode
"
=
"
yes
"
]
&&
[
"
$ps1_expanded
"
=
"
yes
"
]
;
then
if
[
"
$pcmode
"
=
yes
]
&&
[
"
$ps1_expanded
"
=
yes
]
;
then
__git_ps1_branch_name
=
$b
__git_ps1_branch_name
=
$b
b
=
"
\$
{__git_ps1_branch_name}"
b
=
"
\$
{__git_ps1_branch_name}"
fi
fi
...
@@ -522,8 +522,8 @@ __git_ps1 ()
...
@@ -522,8 +522,8 @@ __git_ps1 ()
local
f
=
"
$w$i$s$u
"
local
f
=
"
$w$i$s$u
"
local
gitstring
=
"
$c$b
${
f
:+
$z$f
}
$r$p
"
local
gitstring
=
"
$c$b
${
f
:+
$z$f
}
$r$p
"
if
[
"
$pcmode
"
=
"
yes
"
]
;
then
if
[
"
$pcmode
"
=
yes
]
;
then
if
[
"
${
__git_printf_supports_v
-
}
"
!=
"
yes
"
]
;
then
if
[
"
${
__git_printf_supports_v
-
}
"
!=
yes
]
;
then
gitstring
=
$(
printf
--
"
$printf_format
"
"
$gitstring
"
)
gitstring
=
$(
printf
--
"
$printf_format
"
"
$gitstring
"
)
else
else
printf
-v
gitstring
--
"
$printf_format
"
"
$gitstring
"
printf
-v
gitstring
--
"
$printf_format
"
"
$gitstring
"
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help