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: Mon, 23 May 2016 23:30:59 +0200 [thread overview]
Message-ID: <57437693.3030106@kdbg.org> (raw)
In-Reply-To: <xmqqy4708ss0.fsf@gitster.mtv.corp.google.com>
Am 23.05.2016 um 21:43 schrieb Junio C Hamano:
> Johannes Sixt <j6t@kdbg.org> writes:
>
>> I'm not sure whether the new behavior is a defect in rerere.c or a
>> consequence of the extra rerere call in interactive rebase...
>
> Interesting. When running an unnecessary "git rerere" (because it
> already was run and recorded the preimage), we used to be silent.
> With the updated code, we say something.
>
> At least it seems that we do not record the same preimage as a
> different variant, so the regression is hopefully merely cosmetic.
>
> I do not think it is a crime to say "git rerere" repeatedly without
> changing anything, so I do not think "rebase -i"'s call to rerere
> in die_with_patch is wrong, even though some calls to it seem to be
> made after seeing a "git merge" fail (which means we know 'rerere'
> has been run already).
>
> I think all plumbing that can turn an index into unmerged state has
> a call to git_rerere() at the end (the only obvious exception being
> "update-index" that lets you stuff higher stage entries to the
> index), so as long as "rebase -i" uses them correctly, I suspect
> that die_with_patch shouldn't have to have a call to "git rerere".
I also come to the conclusion that die_with_patch shouldn't have to have
a call to "git rerere". die_with_patch can be called after "git
cherry-pick", "git merge", "git commit", all of which have their own
rerere() invocation.
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.
-- Hannes
next prev parent reply other threads:[~2016-05-23 21:31 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 [this message]
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
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=57437693.3030106@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).