summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-20 18:29:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-20 18:29:19 (GMT)
commit96203bb074544a37fcff9c3f2a68582b76caa263 (patch)
treec94d11799e9665230fc1bdf462fc6142590ce948 /git-pull.sh
parent6a01298a7ed2c18cd68358127304024575b27cc0 (diff)
parent8fe5d87622a4268079bf1e5738474f85d4e5c3bc (diff)
downloadgit-96203bb074544a37fcff9c3f2a68582b76caa263.zip
git-96203bb074544a37fcff9c3f2a68582b76caa263.tar.gz
git-96203bb074544a37fcff9c3f2a68582b76caa263.tar.bz2
Merge branch 'maint'
* maint: Update draft release notes to 1.7.0.3 fetch: Fix minor memory leak fetch: Future-proof initialization of a refspec on stack fetch: Check for a "^{}" suffix with suffixcmp() daemon: parse_host_and_port SIGSEGV if port is specified Makefile: Fix CDPATH problem pull: replace unnecessary sed invocation
Diffstat (limited to 'git-pull.sh')
-rwxr-xr-xgit-pull.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh
index d45b50c..1a4729f 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -41,7 +41,7 @@ strategy_args= diffstat= no_commit= squash= no_ff= ff_only=
log_arg= verbosity= progress=
merge_args=
curr_branch=$(git symbolic-ref -q HEAD)
-curr_branch_short=$(echo "$curr_branch" | sed "s|refs/heads/||")
+curr_branch_short="${curr_branch#refs/heads/}"
rebase=$(git config --bool branch.$curr_branch_short.rebase)
while :
do