diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-09-17 11:42:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-17 11:42:34 -0700 |
| commit | c8ccfc9cdf3381525cce718c846bc62fd86767f7 (patch) | |
| tree | 6dc22b521f3af03855ee0e13f8599694aaee6e2e /git-pull.sh | |
| parent | Merge branch 'fc/fast-export' (diff) | |
| parent | pull: use $curr_branch_short more (diff) | |
| download | tgif-c8ccfc9cdf3381525cce718c846bc62fd86767f7.tar.xz | |
Merge branch 'fc/trivial'
* fc/trivial:
pull: use $curr_branch_short more
add: trivial style cleanup
reset: trivial style cleanup
branch: trivial style fix
reset: trivial refactoring
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 e11d9a0580..b946fd975b 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -187,9 +187,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 |