Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Apr 23, 2013
  1. @phord @gitster

    rebase: find orig_head unambiguously

    phord authored gitster committed
    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
    failing to lock $current_branch, an error about being unable to
    checkout $current_branch again, and it might even decide the
    rebase is a fast-forward when it is not.
    
    In the 'rebase $upstream' case, we already know the unambiguous
    spelling of $current_branch is "HEAD".  Fix git-rebase to find
    $orig_head unambiguously.
    
    Add a test in t3400-rebase.sh which creates an ambiguous branch
    name and rebases it implicitly with 'git rebase $other'.
    
    Signed-off-by: Phil Hord <hordp@cisco.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.