Skip to content

Commit

Permalink
t7501: fix "empty commit" test with NO_PERL
Browse files Browse the repository at this point in the history
t7501.9 tries to check that "git commit" will fail when the
index is unchanged. It relies on previous tests not to have
modified the index. When it was originally written, this was
always the case. However, commit c65dc35 (t7501: test the
right kind of breakage, 2012-03-30) changed earlier tests (4
and 5) to leave a modification in the index.

We never noticed, however, because t7501.7, between the two,
clears the index state as a side effect. However, that test
depends on the PERL prerequisite, and so it does not always
run. Therefore if NO_PERL is set, we do not run the
intervening test, the index is left unclean, and t7501.9
fails.

We could fix this by moving t7501.9 up in the script.
However, this patch instead leaves it in place and adds a
"git reset" before the commit. This makes the test more
explicit about its preconditions, and will future-proof it
against any other changes in the test state.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jeff King authored and Junio C Hamano committed Jan 23, 2014
1 parent ac93028 commit 088304b
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions t/t7501-commit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ test_expect_success 'using invalid commit with -C' '
'

test_expect_success 'nothing to commit' '
git reset --hard &&
test_must_fail git commit -m initial
'

Expand Down

0 comments on commit 088304b

Please sign in to comment.