Re: [PATCH 1/3] git-am: record full index line in the patch used while rebasing

From: Martin von Zweigbergk <martinvonz@gmail.com>
Date: Feb 1, 2013, 06:25 UTC
Message-ID: <CANiSa6gV=C188ZeaPrhdNdG+iPZ_DuBBbYgM0bT55KNOr03rAA@mail.gmail.com>
In-Reply-To: <1359693125-22357-2-git-send-email-gitster@pobox.com>

On Thu, Jan 31, 2013 at 8:32 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 13 quoted lines

> Earlier, a230949 (am --rebasing: get patch body from commit, not
> from mailbox, 2012-06-26) learned to regenerate patch body from the
> commit object while rebasing, instead of reading from the rebase-am
> front-end.  While doing so, it used "git diff-tree" but without
> giving it the "--full-index" option.
>
> This does not matter for in-repository objects; during rebasing, any
> abbreviated object name should uniquely identify them.
>
> But we may be rebasing a commit that contains a change to a gitlink,
> in which case we usually should not have the object (it names a
> commit in the submodule).  A full object name is necessary to later
> reconstruct a fake ancestor index for them.

>From what I can understand, this all makes sense. I didn't notice the

emails about the breakage until now, but I wouldn't have known where to even start looking anyway, so thanks a lot for taking care of it.