t7501: test the right kind of breakage

gitster · gitster · commit c65dc351f0ae · 2012-03-30T11:07:43.000-07:00
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 &lt;gitster@pobox.com&gt;
diff --git 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
 '
 

Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,12 @@ test_expect_success 'setup: initial commit' '`
`30`	`30`	`'`
`31`	`31`
`32`	`32`	`test_expect_success '-m and -F do not mix' '`
	`33`	`+ git checkout HEAD file && echo >>file && git add file &&`
`33`	`34`	`test_must_fail git commit -m foo -m bar -F file`
`34`	`35`	`'`
`35`	`36`
`36`	`37`	`test_expect_success '-m and -C do not mix' '`
	`38`	`+ git checkout HEAD file && echo >>file && git add file &&`
`37`	`39`	`test_must_fail git commit -C HEAD -m illegal`
`38`	`40`	`'`
`39`	`41`