From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Paul Tan <pyokagan@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: [PATCH 1/3] t4151: demonstrate that builtin am corrupts index' stat data
Date: Fri, 21 Aug 2015 01:02:29 -0700 [thread overview]
Message-ID: <1440144151-24026-1-git-send-email-davvid@gmail.com> (raw)
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Reported by Linus Torvalds.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
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.5.0.403.gd17121e
next reply other threads:[~2015-08-21 8:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-21 8:02 David Aguilar [this message]
2015-08-21 8:02 ` [PATCH 2/3] am: do not corrupt the index stat state David Aguilar
2015-08-21 16:37 ` Junio C Hamano
2015-08-21 8:02 ` [PATCH 3/3] am: rename "struct tree_desc t" to "desc" for readability David Aguilar
2015-08-21 16:51 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1440144151-24026-1-git-send-email-davvid@gmail.com \
--to=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=pyokagan@gmail.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).