pull: use $curr_branch_short more

One of the first things git-pull.sh does is setting $curr_branch to the target of HEAD and $curr_branch_short to the same but with the leading "refs/heads/" removed. Simplify the code by using $curr_branch_short instead of setting $curr_branch to the same shortened value. The only other use of $curr_branch in that function doesn't have to be replaced with $curr_branch_short because it just checks if the string is empty. That property is the same with or without the prefix unless HEAD points to "refs/heads/" alone, which is invalid. Noticed-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

René Scharfe committed Sep 8, 2013 at 17:21 UTC b07f7296080b20f5cc2069ce2761cacdd79b3432
1 file changed +2 -3
git-pull.sh
+2 -3
@@ -166,9 +166,8 @@ error_on_no_merge_candidates () {
166 op_prep=with
167 fi
168
169 - curr_branch=${curr_branch#refs/heads/}
170 - upstream=$(git config "branch.$curr_branch.merge")
171 - remote=$(git config "branch.$curr_branch.remote")
169 + upstream=$(git config "branch.$curr_branch_short.merge")
170 + remote=$(git config "branch.$curr_branch_short.remote")
171
172 if [ $# -gt 1 ]; then
173 if [ "$rebase" = true ]; then