public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox•com>
To: Eric Sunshine <sunshine@sunshineco•com>
Cc: Jeff King <peff@peff•net>, Henning Moll <newsScott@gmx•de>,
	Git List <git@vger•kernel.org>
Subject: Re: sporadic git failures on interactive rebase
Date: Wed, 14 Jan 2015 13:57:55 -0800	[thread overview]
Message-ID: <xmqqoaq181p8.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CAPig+cT+bG=Pzws0WKpgnZX2mg4+VmAgxTBCwNiOGDmY4AzSKQ@mail.gmail.com> (Eric Sunshine's message of "Wed, 14 Jan 2015 16:11:09 -0500")

Eric Sunshine <sunshine@sunshineco•com> writes:

> On Wed, Jan 14, 2015 at 4:02 PM, Jeff King <peff@peff•net> wrote:
>> On Wed, Jan 14, 2015 at 04:00:37PM -0500, Eric Sunshine wrote:
>>
>>> > So yeah, the most plausible theory to me so far is unluckiness combined
>>> > with pre-1.8.4.2. That should be easy to disprove if Henning tells us
>>> > his git version.
>>>
>>> Henning mentioned it at the very top of his original problem report:
>>>
>>>     "(git version 2.2.0)"
>>
>> Ah, reading comprehension. It pays off.
>>
>> I'm stumped, then.
>
> Perhaps some new code been added to git-rebase--interactive.sh since
> 75c69766 which neglects to invoke expand_todo_ids()?
>
> Or, possibly some older version of git is being invoked somehow during
> rebase despite his "front end" use of 2.2.0?

Or git_sequence_editor creates conflicting objects?

      reply	other threads:[~2015-01-14 21:58 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-13 10:54 sporadic git failures on interactive rebase Henning Moll
2015-01-14 12:19 ` Jeff King
2015-01-14 12:35   ` Jeff King
2015-01-14 17:12     ` Junio C Hamano
2015-01-14 20:54       ` Jeff King
2015-01-14 21:00         ` Eric Sunshine
2015-01-14 21:02           ` Eric Sunshine
2015-01-14 21:02           ` Jeff King
2015-01-14 21:11             ` Eric Sunshine
2015-01-14 21:57               ` Junio C Hamano [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqoaq181p8.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=newsScott@gmx$(echo .)de \
    --cc=peff@peff$(echo .)net \
    --cc=sunshine@sunshineco$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox