Re: [PATCH 6/6] cherry-pick/revert: reject --rerere-autoupdate when continuing

Hi Junio

Thanks for your comments.

On 02/08/17 23:29, Junio C Hamano wrote:

Junio C Hamano [off-list ref] writes:

quoted

Phillip Wood [off-list ref] writes:

quoted

From: Phillip Wood <redacted>

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