Skip to content

Commit

Permalink
completion: normalize increment/decrement style
Browse files Browse the repository at this point in the history
The style used for incrementing and decrementing variables was fairly
inconsistenty and was normalized to use x++, or ((x++)) in contexts
where the former would otherwise be interpreted as a command. This is a
bash-ism, but for obvious reasons this script is already bash-specific.

Signed-off-by: Philip Jägenstedt <philip@foolip.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Philip Jägenstedt authored and Junio C Hamano committed Feb 22, 2012
1 parent f1c6ffe commit 6e8c755
Showing 1 changed file with 10 additions and 12 deletions.
22 changes: 10 additions & 12 deletions contrib/completion/git-completion.bash
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ __git_ps1_show_upstream ()
svn_upstream=${svn_upstream[ ${#svn_upstream[@]} - 2 ]}
svn_upstream=${svn_upstream%@*}
local n_stop="${#svn_remote[@]}"
for ((n=1; n <= n_stop; ++n)); do
for ((n=1; n <= n_stop; n++)); do
svn_upstream=${svn_upstream#${svn_remote[$n]}}
done

Expand Down Expand Up @@ -166,10 +166,8 @@ __git_ps1_show_upstream ()
for commit in $commits
do
case "$commit" in
"<"*) let ++behind
;;
*) let ++ahead
;;
"<"*) ((behind++)) ;;
*) ((ahead++)) ;;
esac
done
count="$behind $ahead"
Expand Down Expand Up @@ -727,7 +725,7 @@ __git_complete_remote_or_refspec ()
local cur_="$cur" cmd="${words[1]}"
local i c=2 remote="" pfx="" lhs=1 no_complete_refspec=0
if [ "$cmd" = "remote" ]; then
c=$((++c))
((c++))
fi
while [ $c -lt $cword ]; do
i="${words[c]}"
Expand All @@ -746,7 +744,7 @@ __git_complete_remote_or_refspec ()
-*) ;;
*) remote="$i"; break ;;
esac
c=$((++c))
((c++))
done
if [ -z "$remote" ]; then
__gitcomp_nl "$(__git_remotes)"
Expand Down Expand Up @@ -986,7 +984,7 @@ __git_find_on_cmdline ()
return
fi
done
c=$((++c))
((c++))
done
}

Expand All @@ -997,7 +995,7 @@ __git_has_doubledash ()
if [ "--" = "${words[c]}" ]; then
return 0
fi
c=$((++c))
((c++))
done
return 1
}
Expand Down Expand Up @@ -1120,7 +1118,7 @@ _git_branch ()
-d|-m) only_local_ref="y" ;;
-r) has_r="y" ;;
esac
c=$((++c))
((c++))
done

case "$cur" in
Expand Down Expand Up @@ -2574,7 +2572,7 @@ _git_tag ()
f=1
;;
esac
c=$((++c))
((c++))
done

case "$prev" in
Expand Down Expand Up @@ -2627,7 +2625,7 @@ _git ()
--help) command="help"; break ;;
*) command="$i"; break ;;
esac
c=$((++c))
((c++))
done

if [ -z "$command" ]; then
Expand Down

0 comments on commit 6e8c755

Please sign in to comment.