From: Sam Kuper <sam.kuper@uclmail.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: `git merge --abort` does not run `git rerere clear`
Date: Tue, 12 Jun 2018 23:35:30 +0100 [thread overview]
Message-ID: <CAD-Jur+CSfUASSFoXZndEoKvWoc3CU9+V3KrngANskFmQgwNhw@mail.gmail.com> (raw)
In-Reply-To: <xmqqr2lb9406.fsf@gitster-ct.c.googlers.com>
On 12/06/2018, Junio C Hamano <gitster@pobox.com> wrote:
> Sam Kuper <sam.kuper@uclmail.net> writes:
>> [...] It makes sense that `git am [--skip|--abort]` and `git rebase
>> [--skip|--abort]` would run `git rerere clear`.
>>
>> However, if they run it, then shouldn't `git merge --abort` run it, too?
>>
>> If not, then what is the reason why not [...]
>
> I do not think there was any reason, other than that those who added
> "git merge --abort" weren't as careful as they should have been ;-)
Thanks, good to know.
> The command is a mere synonym to "git reset --merge";
Indeed it seems so. Thank you for pointing this out.
> I am not so
> confident that "git reset --merge" should also clear the current
> rerere state. If (and this is a big if) "git reset --merge" should,
> probably the right place to do so would be remove_branch_state(),
> before the function removes merge_rr file.
Unfortunately, I am still not familiar enough with the Git codebase to
be able to express an informed opinion about this. Sorry :(
> Doing so might allow us
> to lose calls to rerere_clear() individual codepaths of various
> "abort" implementations make,
That, I think, was an example of a garden path sentence.[1] Took me
more than one parse to understand it :)
Anyhow, yes, I agree that this might be an opportunity to DRY the
codebase in that regard. (And this would be a good thing, if so.)
> but that would certainly require
> careful thinking to avoid unintended regressions.
I don't use `git reset --merge` often enough to have formed an opinion
about whether there are any use-cases for it in which it would be
inappropriate for it to run `git rerere clear`. Apologies again not to
be able to be more helpful. I hope that you or others on the list will
be able to consider this matter, and the question of how/where to best
implement the change.
Thank you for your work maintaining Git!
[1] https://en.wikipedia.org/wiki/Garden_path_sentence
prev parent reply other threads:[~2018-06-12 22:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-12 19:32 `git merge --abort` does not run `git rerere clear` Sam Kuper
2018-06-12 19:52 ` Junio C Hamano
2018-06-12 22:35 ` Sam Kuper [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=CAD-Jur+CSfUASSFoXZndEoKvWoc3CU9+V3KrngANskFmQgwNhw@mail.gmail.com \
--to=sam.kuper@uclmail.net \
--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).