On Fri, Dec 20, 2024 at 07:27:18AM -0800, Junio C Hamano wrote: > > Sorry, just realized that "diff --check" (and apply) complains about the > > indentation here. It's a TAB followed by 14 spaces, instead of two TABs > > followed by 6 spaces. I guess caused by me lining things up manually. > > "git am --whitespace=fix" with or without "-3" corrects such > glitches just fine, and "git am --whitespace=error" correctly stops > me from applying such a patch. > > What is worrysome is "git am -3 --whitespace=warn" does not seem to > catch it (without "-3" it works just fine). I do not know offhand > if this is a recent regression or not. Interesting. I noticed with stock "git am" (I sometimes "reset --hard" and reapply my own patches because I made tweaks to the commit message while sending). Looks like it does not warn even going back to v2.0.5 (my stock "this was a long time ago" version). Curiously if you accidentally try to apply the patch a second time, it does notice the problem. So I agree it's a bug, but I think it has been around for a while. -Peff
