From: Johannes Sixt <j6t@kdbg.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: Small rerere in rebase regression
Date: Tue, 24 May 2016 22:46:15 +0200 [thread overview]
Message-ID: <5744BD97.4070902@kdbg.org> (raw)
In-Reply-To: <xmqqk2ik77cr.fsf@gitster.mtv.corp.google.com>
Am 24.05.2016 um 00:11 schrieb Junio C Hamano:
> Johannes Sixt <j6t@kdbg.org> writes:
>> However, calling "git rerere" after a failed "git commit" may be
>> destructive: it would record a resolution even though the commit has
>> not be completed. Think of an squash commit being aborted because the
>> user notices an error in the last minute. If that error is in a
>> conflict resolution, that wrong resolution would be recorded.
>
> So, the behaviour change you observed uncovered a small bug in
> "rebase -i" that was covered by the old limitation of "rerere" that
> refrained from creating preimage when there already is one?
I had a closer look, and found that the failure mode I described does
not occur: after having resolved a commit, the user can call "git rebase
--continue", but the "git commit" invocation that occurs there is
guarded with a mere 'die', not 'die_with_patch'.
All other "git commit" guarded with 'die_with_patch' are either not
interactive or are after a non-conflicting merge or cherry-pick (and so
there was no opportunity to resolve a conflict).
-- Hannes
prev parent reply other threads:[~2016-05-24 20:46 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-23 18:01 Small rerere in rebase regression Johannes Sixt
2016-05-23 19:43 ` Junio C Hamano
2016-05-23 21:30 ` Johannes Sixt
2016-05-23 22:11 ` Junio C Hamano
2016-05-24 13:18 ` Johannes Schindelin
2016-05-24 19:48 ` Johannes Sixt
2016-05-25 5:38 ` Johannes Schindelin
2016-05-25 5:47 ` Johannes Schindelin
2016-05-27 16:28 ` Johannes Sixt
2016-05-28 6:39 ` Johannes Schindelin
2016-05-24 20:46 ` Johannes Sixt [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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5744BD97.4070902@kdbg.org \
--to=j6t@kdbg.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).