git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: conrad.irwin@gmail.com, git@vger.kernel.org
Subject: Re: [PATCH v3 0/3] Git commit --patch (again)
Date: Mon, 09 May 2011 16:56:20 -0700	[thread overview]
Message-ID: <7vsjsnmnrv.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <7vwrhzmnxf.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Mon, 09 May 2011 16:53:00 -0700")

Junio C Hamano <gitster@pobox.com> writes:

> Jeff King <peff@peff.net> writes:
>
>> It's unfortunately not quite as simple as having that test succeed, as
>> it changes state that breaks later tests. I didn't investigate deeply,
>> though.
>
> Yeah, that test that hardcodes the exact commit sequence is disgusting.
> In the meantime...
>
> -- >8 --
> From: Jeff King <peff@peff.net>
> Subject: [PATCH] t7501.8: feed a meaningful command

And then on top of that, Conrad's "allow commit --interactive <path>"
would come, with this squashed in.  The last "reset HEAD^" is nasty but I
don't have enough energy to fix 12ace0b (Add test case for basic commit
functionality., 2007-07-31) today.

 t/t7501-commit.sh |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index 3d2b14d..c2fd116 100755
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -41,11 +41,12 @@ test_expect_success \
 	"echo King of the bongo >file &&
 	test_must_fail git commit -m foo -a file"
 
-test_expect_success PERL 'cannot use paths with --interactive' '
+test_expect_success PERL 'can use paths with --interactive' '
 	echo bong-o-bong >file &&
 	# 2: update, 1:st path, that is all, 7: quit
 	( echo 2; echo 1; echo; echo 7 ) |
-	test_must_fail git commit -m foo --interactive file
+	git commit -m foo --interactive file &&
+	git reset --hard HEAD^
 '
 
 test_expect_success \

  reply	other threads:[~2011-05-09 23:56 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 [this message]
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     ` [PATCH] Test atomic git-commit --interactive Conrad Irwin
2011-05-10 19:43       ` 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=7vsjsnmnrv.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=conrad.irwin@gmail.com \
    --cc=git@vger.kernel.org \
    --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).