From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 30 Mar 2012 18:04:08 +0000 (-0700)
Subject: t7501: test the right kind of breakage
X-Git-Tag: v1.7.10.1~14^2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c65dc351f0ae184f69cbc0b6555ff19aacb70e01

t7501: test the right kind of breakage

These tests try to run "git commit" with various "forbidden" combinations
of options and expect the command to fail, but they do so without having
any change added to the index.  We wouldn't be able to catch breakages
that would allow these combinations by mistake with them because the
command will fail with "nothing to commit" anyway.

Make sure we have something added to the index before running the command.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index 8bb38337a9..45446b186e 100755
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -30,10 +30,12 @@ test_expect_success 'setup: initial commit' '
 '
 
 test_expect_success '-m and -F do not mix' '
+	git checkout HEAD file && echo >>file && git add file &&
 	test_must_fail git commit -m foo -m bar -F file
 '
 
 test_expect_success '-m and -C do not mix' '
+	git checkout HEAD file && echo >>file && git add file &&
 	test_must_fail git commit -C HEAD -m illegal
 '