Thread (10 messages) flat view 10 messages, 4 authors, 2016-06-15

Re: [PATCH/RFC 2/2] git rebase -i: Warn removed or dupplicated commits

From: Remi Galan Alfonso <hidden>
Date: 2016-06-15 23:05:01

Eric Sunshine[off-list ref] writes:
Shouldn't this case also 'die' when rebase.checkLevel is "error"? And,
why doesn't the user get advice about configuring rebase.checkLevel in
this case?
Stephen Kelly[off-list ref] writes:
I sometimes duplicate commits deliberately if I want to split a commit in
two.
Matthieu Moy[off-list ref] writes:
The more I think about it, the more I think we should either not warn at
all on duplicate commits, or have a separate config variable.
Put in common because two config variables would have an effect on the
'die' and advise part.

In this patch we didn't put the 'die' in the duplicate commit part
since there was only one config variable and there are cases where the
user might want to duplicate commits.

After the code reviewing of Eric Sunshine and Stephen Kelly, we also
came to the conclusion that we should use two config variables, one
about missing commits and the other about duplicate commits.

This way if you deliberately want to use duplicate commits, you can
just set the value to 'ignore' for duplicate commits and still have
'warn'/'error' for missing commits. Moreover, each part would have its
'die' depending on the value of the corresponding config variable.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help