Hi Linus, On 2015-08-17 01:33, Linus Torvalds wrote: > On Sun, Aug 16, 2015 at 12:46 PM, Linus Torvalds > <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: >> >> Maybe it has always done this, and I just haven't noticed (I usually >> _just_ do the "git reset --hard" thing, don't ask me why I wanted to >> be doubly sure this time). But maybe it's an effect of the new >> built-in "am". > > I bisected this. It's definitely used to work, and the regression is > from the new built-in am. This patch is a reproducer: -- snipsnap -- >From 5323f1c309ad40721e2e19fa9c6ce5ad52d98271 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin <johannes.schindelin@xxxxxx> Date: Mon, 17 Aug 2015 09:37:39 +0200 Subject: [PATCH] t4151: demonstrate that builtin am corrupts index' stat data Reported by Linus Torvalds. Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> --- t/t4151-am-abort.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh index 05bdc3e..bf2e6f4 100755 --- a/t/t4151-am-abort.sh +++ b/t/t4151-am-abort.sh @@ -168,4 +168,16 @@ test_expect_success 'am --abort on unborn branch will keep local commits intact' test_cmp expect actual ' +test_expect_failure 'am --abort leaves index stat info alone' ' + git checkout -f --orphan stat-info && + git reset && + test_commit should-be-untouched && + test-chmtime =0 should-be-untouched.t && + git update-index --refresh && + git diff-files --exit-code --quiet && + test_must_fail git am 0001-*.patch && + git am --abort && + git diff-files --exit-code --quiet +' + test_done -- 2.3.1.windows.1.9.g8c01ab4 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html