diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-20 21:29:19 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-20 21:29:19 +0300 |
| commit | 96203bb074544a37fcff9c3f2a68582b76caa263 (patch) | |
| tree | c94d11799e9665230fc1bdf462fc6142590ce948 /git-pull.sh | |
| parent | 6a01298a7ed2c18cd68358127304024575b27cc0 (diff) | |
| parent | 8fe5d87622a4268079bf1e5738474f85d4e5c3bc (diff) | |
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-x | git-pull.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh index d45b50cf47..1a4729f7bb 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 |