diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-10-21 17:58:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-21 17:58:21 -0700 |
| commit | ca6c06b2efe2f55c498670efcb419bce35678e03 (patch) | |
| tree | 741239f028d57d825b8bbd66df8271ad0576bbe0 /git-pull.sh | |
| parent | Merge branch 'jc/maint-co-track' (diff) | |
| parent | pull: allow "git pull origin $something:$current_branch" into an unborn branch (diff) | |
| download | tgif-ca6c06b2efe2f55c498670efcb419bce35678e03.tar.xz | |
Merge branch 'js/maint-fetch-update-head'
* js/maint-fetch-update-head:
pull: allow "git pull origin $something:$current_branch" into an unborn branch
Fix fetch/pull when run without --update-head-ok
Conflicts:
t/t5510-fetch.sh
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-pull.sh b/git-pull.sh index 75c36100a2..664fe34419 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -124,7 +124,7 @@ orig_head=$(git rev-parse --verify HEAD 2>/dev/null) git fetch --update-head-ok "$@" || exit 1 curr_head=$(git rev-parse --verify HEAD 2>/dev/null) -if test "$curr_head" != "$orig_head" +if test -n "$orig_head" && test "$curr_head" != "$orig_head" then # The fetch involved updating the current branch. @@ -172,7 +172,7 @@ esac if test -z "$orig_head" then - git update-ref -m "initial pull" HEAD $merge_head "" && + git update-ref -m "initial pull" HEAD $merge_head "$curr_head" && git read-tree --reset -u HEAD || exit 1 exit fi |