| commit | b07f7296080b20f5cc2069ce2761cacdd79b3432 | |
| author | René Scharfe <l.s.r@web.de> | |
| Sun, 8 Sep 2013 15:21:44 +0000 (8 17:21 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 8 Sep 2013 18:39:30 +0000 (8 11:39 -0700) | ||
| tree | bc65127d4958795f014f4319e2e6d034efd58477 | treesnapshot (tar.gz zip) |
| parent | d521abf8900dc38f88ed8fbb007848fb2a812510 | commitdiff |
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>
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>
| git-pull.sh | diffblobblamehistory |