From: Phillip Wood <phillip.wood@talktalk.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH 6/6] cherry-pick/revert: reject --rerere-autoupdate when continuing
Date: Thu, 3 Aug 2017 11:15:48 +0100 [thread overview]
Message-ID: <6a7c9661-9f12-99c9-1fc1-4a4abd3d0660@talktalk.net> (raw)
In-Reply-To: <xmqqlgn1r4bu.fsf@gitster.mtv.corp.google.com>
Hi Junio
Thanks for your comments.
On 02/08/17 23:29, Junio C Hamano wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> Phillip Wood <phillip.wood@talktalk.net> writes:
>>
>>> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>>>
>>> cherry-pick and revert should not accept --[no-]rerere-autoupdate once
>>> they have started.
>>
>> Hmph, why shouldn't they? In other words, shouldn't the usual "try
>> to carry forward from the original invocation (saved in the state
>> file), but allow overriding from the command line" rule apply?
>
> Actually, I do not care _too_ deeply between
>
> * You can only give "--[no-]rerere-autoupdate" at the beginning and
> cannot change your mind later.
>
> and
>
> * The "--[no-]rerere-autoupdate" you give at the beginning is used
> throughout your multi-commit cherry-pick session, but you can
> give an opposite one from the command line when you say
> "--continue", and in that case it takes effect only for a single
> commit.
>
> If I understand correctly, the former is what 5-6/6 implements.
Yes, that's correct. It was easier to implement it that way
> The
> latter makes it more in line with how "am -3" followed by "am --no-3
> --continue" behaves.
I'm a bit confused about what am does when you pass extra options to
--continue. It looks like they do not persist if there's another
conflict and may only apply to the first patch that is applied when
resuming - I'd need to spend more time looking at the code or run a test
to be sure.
Best Wishes
Phillip
next prev parent reply other threads:[~2017-08-03 10:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-02 10:44 [PATCH 0/6] am/cherry-pick/rebase/revert --rerere-autoupdate fixes Phillip Wood
2017-08-02 10:44 ` [PATCH 1/6] am: remember --rerere-autoupdate setting Phillip Wood
2017-08-02 10:44 ` [PATCH 2/6] rebase: honor --rerere-autoupdate Phillip Wood
2017-08-02 10:44 ` [PATCH 3/6] rebase -i: " Phillip Wood
2017-08-02 10:44 ` [PATCH 4/6] t3504: use test_commit Phillip Wood
2017-08-02 10:44 ` [PATCH 5/6] cherry-pick/revert: remember --rerere-autoupdate Phillip Wood
2017-08-02 10:44 ` [PATCH 6/6] cherry-pick/revert: reject --rerere-autoupdate when continuing Phillip Wood
2017-08-02 21:57 ` Junio C Hamano
2017-08-02 22:29 ` Junio C Hamano
2017-08-03 10:15 ` Phillip Wood [this message]
2017-08-03 17:19 ` Junio C Hamano
2017-08-07 10:17 ` Phillip Wood
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=6a7c9661-9f12-99c9-1fc1-4a4abd3d0660@talktalk.net \
--to=phillip.wood@talktalk.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
/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).