Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH 2/2] Catch and handle git-commit failures in git-rebase --interactive

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:44:00

"Shawn O. Pearce" [off-list ref] writes:
 Comments welcome.  This is on top of my 1/2 patch but we could
 drop my 1/2 and rewrite this to not use --no-verify, but handle
 the git-commit error correctly.

 However that would force users to fix whitespace errors in later
 patches in a series if they use -i, even though non-i wouldn't
 require that sort of fix-up.  So I think we should do both patches
 in the series.
I agree with both patches.

When one wants to use rebase to fix-up whitespace breakage in patches in
bulk, you can set apply.whitespace to "fix".  One bad side effect of
this is that if you usually have apply.whitespace set to "fix" (because
you need to accept a lot of patches but your contributers tend to give
crappy patches), you need to temporarily change the configuration while
rebasing if you do not want to preserve intentional whitespace breakages
(e.g. ones in test scripts).  This can be argued either a feature or a
misfeature.

But rebase -i breaking and squashing upon commit failure (including
pre-commit safety) cannot be called either feature nor misfeature --- it
is an outright bug.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help