summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-17 11:42:34 -0700
committerJunio C Hamano <gitster@pobox.com>2013-09-17 11:42:34 -0700
commitc8ccfc9cdf3381525cce718c846bc62fd86767f7 (patch)
tree6dc22b521f3af03855ee0e13f8599694aaee6e2e /git-pull.sh
parent984ac91e72578aa271daf79b6c44d34da2a8dc5d (diff)
parentb07f7296080b20f5cc2069ce2761cacdd79b3432 (diff)
downloadgit-c8ccfc9cdf3381525cce718c846bc62fd86767f7.tar.gz
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-xgit-pull.sh5
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