Thread (2 messages) flat view 2 messages, 2 authors, 2017-08-03

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

From: Junio C Hamano <hidden>
Date: 2017-08-02 22:29:56

Junio C Hamano [off-list ref] writes:
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.  The
latter makes it more in line with how "am -3" followed by "am --no-3
--continue" behaves.

Thanks.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help