Re: [PATCH] rebase: find orig_head unambiguously

Phil Hord writes: > When we 'git rebase $upstream', git uses 'rev-parse --verify > $current_branch' to find ORIG_HEAD. But if $current_branch > is ambiguous, 'rev-parse --verify' emits a warning and returns > a SHA1 anyway. When the wrong ambiguous choice is used, > git-rebase fails non-gracefu

[PATCH] rebase: find orig_head unambiguously

When we 'git rebase $upstream', git uses 'rev-parse --verify $current_branch' to find ORIG_HEAD. But if $current_branch is ambiguous, 'rev-parse --verify' emits a warning and returns a SHA1 anyway. When the wrong ambiguous choice is used, git-rebase fails non-gracefully: it emits a warning about