Re: Ambiguous sha-1 during a rebase

2016-04-14 Thread Remi Galan Alfonso
Matthieu Moy writes: > Mike Hommey writes: > > > Yeah, that definitely is a weird corner case. Interestingly, it was > > complaining about "error: short SHA1 e34ff55 is ambiguous." when apply > > *other* commits that were in the list prior to it, > > I think it did before: when normalizing the

Re: Ambiguous sha-1 during a rebase

2016-04-14 Thread Johannes Schindelin
Hi Junio, On Wed, 13 Apr 2016, Junio C Hamano wrote: > Mike Hommey writes: > > > Should git-rebase use full sha-1s under the hood to avoid these type of > > races? > > It already should be doing so since Aug 2013, IIRC. Indeed. It is one of the things that makes interactive rebases so unbeara

Re: Ambiguous sha-1 during a rebase

2016-04-14 Thread Matthieu Moy
Mike Hommey writes: > Yeah, that definitely is a weird corner case. Interestingly, it was > complaining about "error: short SHA1 e34ff55 is ambiguous." when apply > *other* commits that were in the list prior to it, I think it did before: when normalizing the list to long sha1, i.e. right after

Re: Ambiguous sha-1 during a rebase

2016-04-14 Thread Mike Hommey
On Thu, Apr 14, 2016 at 11:09:06AM +0200, Matthieu Moy wrote: > I suspect you did: > > $ git rebase -i > # editor pops up > # switch to another terminal and fetch from elsewhere > # close editor That's possible, but I don't remember with certainty. At least it's plausible. > Then only, git turns

Re: Ambiguous sha-1 during a rebase

2016-04-14 Thread Matthieu Moy
Mike Hommey writes: > On Wed, Apr 13, 2016 at 03:42:44PM -0700, Junio C Hamano wrote: >> Mike Hommey writes: >> >> > Should git-rebase use full sha-1s under the hood to avoid these type of >> > races? >> >> It already should be doing so since Aug 2013, IIRC. > > I'm using 2.8.1. Would there ha

Re: Ambiguous sha-1 during a rebase

2016-04-13 Thread Mike Hommey
On Wed, Apr 13, 2016 at 03:42:44PM -0700, Junio C Hamano wrote: > Mike Hommey writes: > > > Should git-rebase use full sha-1s under the hood to avoid these type of > > races? > > It already should be doing so since Aug 2013, IIRC. I'm using 2.8.1. Would there have been a regression? Mike -- To

Re: Ambiguous sha-1 during a rebase

2016-04-13 Thread Junio C Hamano
Mike Hommey writes: > Should git-rebase use full sha-1s under the hood to avoid these type of > races? It already should be doing so since Aug 2013, IIRC. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info

Ambiguous sha-1 during a rebase

2016-04-13 Thread Mike Hommey
Hi, Something interesting happened to me. I was in the middle of an interactive rebase, and after a --continue, I got: error: short SHA1 e34ff55 is ambiguous. fatal: Needed a single revision Invalid commit name: e34ff55 One thing that happened, is that, while running that interactive rebase, I /