diff options
| author | Jeff King <peff@peff.net> | 2012-07-26 20:31:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-26 21:23:35 (GMT) |
| commit | ceacd91a063b8efea169d07913cabb0f4d33aee4 (patch) | |
| tree | 4da5063a7d81b7b4efe9595a377d7c3ed37ea575 | |
| parent | 1f4bf34578e93e8f5fa06652695e839bc51ea90f (diff) | |
| download | git-ceacd91a063b8efea169d07913cabb0f4d33aee4.zip git-ceacd91a063b8efea169d07913cabb0f4d33aee4.tar.gz git-ceacd91a063b8efea169d07913cabb0f4d33aee4.tar.bz2 | |
t7502: drop confusing test_might_fail call
In t7502.20, we run "git commit" and check that it warns us
that the author and committer identity are not the same
(this is always the case in the test environment, since we
set up the idents differently).
Instead of actually making a commit, we have a clean index,
so the "git commit" we run will fail. This is marked as
might_fail, which is not really correct; it will always fail
since there is nothing to commit.
However, the only reason not to do a complete commit would
be to see the intermediate state of the COMMIT_EDITMSG file
when the commit is not completed. We don't need to care
about this, though; even a complete commit will leave
COMMIT_EDITMSG for us to view. By doing a real commit and
dropping the might_fail, we are more robust against other
unforeseen failures of "git commit" that might influence our
test result.
It might seem less robust to depend on the fact that "git
commit" leaves COMMIT_EDITMSG in place after a successful
commit. However, that brings this test in line with others
parts of the script, which make the same assumption.
Furthermore, if that ever does change, the right solution is
not to prevent commit from completing, but to set EDITOR to
a script that will record the contents we see. After all,
the point of these tests is to check what the user sees in
their EDITOR, so that would be the most direct test. For
now, though, we can continue to use the "shortcut" that
COMMIT_EDITMSG is left intact.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t7502-commit.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh index efecb06..d261b82 100755 --- a/t/t7502-commit.sh +++ b/t/t7502-commit.sh @@ -237,7 +237,7 @@ test_expect_success 'cleanup commit messages (strip,-F,-e): output' ' test_expect_success 'message shows author when it is not equal to committer' ' echo >>negative && - test_might_fail git commit -e -m "sample" && + git commit -e -m "sample" -a && test_i18ngrep \ "^# Author: *A U Thor <author@example.com>\$" \ .git/COMMIT_EDITMSG |