From: Johannes Sixt <j6t@kdbg•org>
To: Chris Webb <chris@arachsys•com>
Cc: git@vger•kernel.org, Junio C Hamano <gitster@pobox•com>
Subject: Re: [PATCH] rebase -i: handle fixup of root commit correctly
Date: Tue, 31 Jul 2012 22:04:28 +0200 [thread overview]
Message-ID: <50183A4C.9080706@kdbg.org> (raw)
In-Reply-To: <20120731124824.GC14028@arachsys.com>
Am 31.07.2012 14:48, schrieb Chris Webb:
> Chris Webb<chris@arachsys•com> writes:
>
>> If we have a conflict in the middle of a chain of fixup/squashes, as far as
>> I can see, we have a HEAD with all the previous successful fixups applied,
>> conflict markers for the current failed pick, and when the conflict has been
>> resolved, git rebase --continue will commit --amend the resolution and
>> continue? Isn't that the correct behaviour here?
>
> As an explicit test, I've just tried a chain of four squashed commits, each
> of which deliberately resulted in a conflict to manually resolve. For each
> squash, I was left with conflict markers on top of what had already been
> squashed in the expected way, and when I continued after resolving these,
> the resolution was 'commit --amend'ed in the expected way, with the same
> behaviour and resulting commit at the end of the rebase -i as I get with a
> copy of git without this patch.
OK, good. One subtlety to watch out for is when commit messages are
edited. That is, if you edit the proposed message at 'rebase --continue'
after the first squash failed, is the new text preserved until the last
squash? I *think* that previously that was the case.
That said, I do appreciate the new modus operandi. The state when a rebase
is interrupted is much clearer than earlier: now HEAD contains everything
that was successfully replayed so far, and the index anything that failed.
-- Hannes
next prev parent reply other threads:[~2012-07-31 20:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-24 12:17 [PATCH] rebase -i: handle fixup of root commit correctly Chris Webb
2012-07-24 19:22 ` Junio C Hamano
2012-07-31 9:14 ` Johannes Sixt
2012-07-31 11:19 ` Chris Webb
2012-07-31 12:48 ` Chris Webb
2012-07-31 20:04 ` Johannes Sixt [this message]
2012-07-31 22:47 ` Chris Webb
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=50183A4C.9080706@kdbg.org \
--to=j6t@kdbg$(echo .)org \
--cc=chris@arachsys$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(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