threads / discuss / 34659

git rebase --interactive using short SHA-1's internally

Subject: git rebase --interactive using short SHA-1's internally

## tl;dr

4 messages between Aug 9, 2013 and Aug 10, 2013.

replies: 3people: 3as markdown or json

Diogo de Campos· Aug 9, 2013, 19:22 UTC · lore

Had some problems rebasing a large repository, fatal error because a short SHA-1 ref was ambiguous.

After a quick inspection of git-rebase--interactive.sh, I found that it uses short refs in a few places (git rev-parse --short). Removing that option fixed my problem.

See: https://github.com/git/git/blob/master/git-rebase--interactive.sh#L902

-- 
Diogo Campos
David· Aug 10, 2013, 00:50 UTC · re: Diogo de Campos · lore

Re: git rebase --interactive using short SHA-1's internally

On 10 August 2013 05:22, Diogo de Campos <campos@esss.com.br> wrote:
> Had some problems rebasing a large repository, fatal error because a
> short SHA-1 ref was ambiguous.

This recent disussion might also interest you: http://thread.gmane.org/gmane.comp.version-control.git/229091

Junio C Hamano· Aug 10, 2013, 05:28 UTC · re: David · lore

Re: git rebase --interactive using short SHA-1's internally

David <bouncingcats@gmail.com> writes:
Show 6 quoted lines
> On 10 August 2013 05:22, Diogo de Campos <campos@esss.com.br> wrote:
>> Had some problems rebasing a large repository, fatal error because a
>> short SHA-1 ref was ambiguous.
>
> This recent disussion might also interest you:
> http://thread.gmane.org/gmane.comp.version-control.git/229091
I was wondering why the topic looked familiar ;-)
Diogo de Campos· Aug 10, 2013, 13:17 UTC · re: Junio C Hamano · lore

Re: git rebase --interactive using short SHA-1's internally

Ooops, that's exactly it =)
On Sat, Aug 10, 2013 at 2:28 AM, Junio C Hamano <gitster@pobox.com> wrote:
Show 10 quoted lines
> David <bouncingcats@gmail.com> writes:
>
>> On 10 August 2013 05:22, Diogo de Campos <campos@esss.com.br> wrote:
>>> Had some problems rebasing a large repository, fatal error because a
>>> short SHA-1 ref was ambiguous.
>>
>> This recent disussion might also interest you:
>> http://thread.gmane.org/gmane.comp.version-control.git/229091
>
> I was wondering why the topic looked familiar ;-)
-- 
Diogo Campos

Engineering Simulation and Scientific Software

BOS - Business Operation Support
Software Engineer

← back to recent threads