Re: [PATCH v3 0/3] Git commit --patch (again)
- From
Junio C Hamano <gitster@pobox.com>
- Date
- May 9, 2011, 23:53 UTC
- Message-ID
- <7vwrhzmnxf.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <20110509220806.GC3719@sigill.intra.peff.net>
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
The command expects "git commit --interactive <path>" to fail because you cannot (yet) limit "commit --interactive" with a pathspec, but even if the command allowed to take <path>, the test would have failed as saying just 7:quit would leave the index the same as the current commit, leading to an attempt to create an empty commit that would fail without --allow-empty.
Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- t/t7501-commit.sh | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh index a76c474..3d2b14d 100755 --- a/t/t7501-commit.sh +++ b/t/t7501-commit.sh @@ -41,10 +41,12 @@ test_expect_success \ "echo King of the bongo >file && test_must_fail git commit -m foo -a file" -test_expect_success PERL \ - "using paths with --interactive" \ - "echo bong-o-bong >file && - ! (echo 7 | git commit -m foo --interactive file)" +test_expect_success PERL 'cannot 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 +' test_expect_success \ "using invalid commit with -C" \
-- 1.7.5.1.290.g1b565