diff options
| author | René Scharfe <l.s.r@web.de> | 2013-09-08 15:21:44 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-08 18:39:30 (GMT) |
| commit | b07f7296080b20f5cc2069ce2761cacdd79b3432 (patch) | |
| tree | bc65127d4958795f014f4319e2e6d034efd58477 /git-pull.sh | |
| parent | d521abf8900dc38f88ed8fbb007848fb2a812510 (diff) | |
| download | git-b07f7296080b20f5cc2069ce2761cacdd79b3432.zip git-b07f7296080b20f5cc2069ce2761cacdd79b3432.tar.gz git-b07f7296080b20f5cc2069ce2761cacdd79b3432.tar.bz2 | |
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>
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/git-pull.sh b/git-pull.sh index f0df41c..d8b2708 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -166,9 +166,8 @@ error_on_no_merge_candidates () { op_prep=with fi - curr_branch=${curr_branch#refs/heads/} - upstream=$(git config "branch.$curr_branch.merge") - remote=$(git config "branch.$curr_branch.remote") + upstream=$(git config "branch.$curr_branch_short.merge") + remote=$(git config "branch.$curr_branch_short.remote") if [ $# -gt 1 ]; then if [ "$rebase" = true ]; then |