severity 664987 important tags 664987 + upstream patch fixed-upstream quit Hi Trent,
Trent W. Buck wrote: > While interactively rebasing, I have twice run into this (same repo, > different rebase steps, different ambiguous hashes): > > [...] > $ git commit -aC1dafcb6 > [detached HEAD 7caed94] .crawlrc: leverage settings/ from upstream. > Author: Trent W. Buck <trentb...@gmail.com> > 1 files changed, 26 insertions(+), 65 deletions(-) > $ git show > $ git rebase --continue > [detached HEAD ebd32a8] .crawlrc: switch pickup logic from a whitelist to > a blacklist. > Author: Trent W. Buck <trentb...@gmail.com> > 1 files changed, 127 insertions(+), 34 deletions(-) > error: short SHA1 dccb2c5 is ambiguous. > fatal: Needed a single revision > Invalid commit name: dccb2c5 Thanks for a pleasant report. Fixed by 75c69766 (rebase -i: fix short SHA-1 collision, 2013-08-23). The patch is in branch "master" and presumably will be part of git 1.8.5. [...] > Freenode's #git suggested I increase core.abbrev. I did so in > .gitconfig, and OTHER commands see that it is now 16, but rebase -i > ignores me: Fixed by 56895038 (rebase -i: respect core.abbrev, 2013-09-28), also in "master". Ciao, Jonathan -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
