git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Conrad Irwin <conrad.irwin@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
	Conrad Irwin <conrad.irwin@gmail.com>
Subject: [PATCH] Test atomic git-commit --interactive
Date: Tue, 10 May 2011 12:12:31 -0700	[thread overview]
Message-ID: <1305054751-12327-1-git-send-email-conrad.irwin@gmail.com> (raw)
In-Reply-To: <BANLkTikwjZkzMxksBsVTFRYdhE3L6ZQM0A@mail.gmail.com>

Signed-off-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 t/t7501-commit.sh |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index a76c474..2a4e453 100755
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -130,6 +130,15 @@ test_expect_success PERL \
 	"interactive add" \
 	"echo 7 | git commit --interactive | grep 'What now'"
 
+test_expect_success PERL \
+	"--interactive doesn't change index if editor aborts" \
+	"EDITOR=false echo zoo >file && \
+	test_must_fail git diff --exit-code > diff1 && \
+	(echo u ; echo '*' ; echo q) |\
+	test_must_fail git commit --interactive && \
+	git diff > diff2 && \
+	git diff --no-index diff1 diff2"
+
 test_expect_success \
 	"showing committed revisions" \
 	"git rev-list HEAD >current"
-- 
1.7.5.188.g4817

  reply	other threads:[~2011-05-10 19:13 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-07  5:59 [PATCH v3 0/3] Git commit --patch (again) conrad.irwin
2011-05-07  5:59 ` [PATCH v3 1/3] Use a temporary index for git commit --interactive conrad.irwin
2011-05-07  6:00 ` [PATCH v3 2/3] Allow git commit --interactive with paths conrad.irwin
2011-05-07  6:00 ` [PATCH v3 3/3] Add support for -p/--patch to git-commit conrad.irwin
2011-05-07 10:46   ` Valentin Haenel
2011-05-07 17:55     ` Conrad Irwin
2011-05-07 17:58       ` [PATCH v4 " Conrad Irwin
2011-05-08 19:27         ` Junio C Hamano
2011-05-07 17:59       ` [PATCH] Add commit to list of config.singlekey commands Conrad Irwin
2011-05-07  9:49 ` [PATCH v3 0/3] Git commit --patch (again) Sverre Rabbelier
2011-05-09 14:44 ` Jeff King
2011-05-09 16:53   ` Junio C Hamano
2011-05-09 22:08     ` Jeff King
2011-05-09 23:53       ` Junio C Hamano
2011-05-09 23:56         ` Junio C Hamano
2011-05-10 20:01           ` Jeff King
2011-05-10 19:56         ` Jeff King
2011-05-10  6:42   ` Conrad Irwin
2011-05-10 19:12     ` Conrad Irwin [this message]
2011-05-10 19:43       ` [PATCH] Test atomic git-commit --interactive Jeff King
2011-05-10 21:01         ` Conrad Irwin

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=1305054751-12327-1-git-send-email-conrad.irwin@gmail.com \
    --to=conrad.irwin@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    /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).