| commit | e980765c59c173e9a10ce1069c763645b87fd50c | |
| author | Phil Hord <hordp@cisco.com> | |
| Tue, 23 Oct 2012 20:39:56 +0000 (23 16:39 -0400) | ||
| committer | Jeff King <peff@peff.net> | |
| Thu, 25 Oct 2012 09:32:11 +0000 (25 05:32 -0400) | ||
| tree | 2307619d5a0395087b2d783b221a06c1edd0955d | treesnapshot (tar.gz zip) |
| parent | 8c7a786b6c8eae8eac91083cdc9a6e337bc133b0 | commitdiff |
git-pull: Avoid merge-base on detached head
git pull --rebase does some clever tricks to find the base
for $upstream, but it forgets that we may not have any
branch at all. When this happens, git merge-base reports its
"usage" help in the middle of an otherwise successful
rebase operation, because git-merge is called with one too
few parameters.
Since we do not need the merge-base trick in the case of a
detached HEAD, detect this condition and bypass the clever
trick and the usage noise.
Signed-off-by: Phil Hord <hordp@cisco.com>
Signed-off-by: Jeff King <peff@peff.net>
git pull --rebase does some clever tricks to find the base
for $upstream, but it forgets that we may not have any
branch at all. When this happens, git merge-base reports its
"usage" help in the middle of an otherwise successful
rebase operation, because git-merge is called with one too
few parameters.
Since we do not need the merge-base trick in the case of a
detached HEAD, detect this condition and bypass the clever
trick and the usage noise.
Signed-off-by: Phil Hord <hordp@cisco.com>
Signed-off-by: Jeff King <peff@peff.net>
| git-pull.sh | diffblobblamehistory |