| commit | 5d274859444260142a77b844ab616f07bf80aaa5 | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Fri, 23 Jul 2010 17:04:01 +0000 (23 12:04 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 23 Jul 2010 21:43:24 +0000 (23 14:43 -0700) | ||
| tree | 18542e32928886f7ad74bdaf97eec22c34e1e818 | treesnapshot (tar.gz zip) |
| parent | 800f11040dec4efc4d94206869d9004b23dd700a | commitdiff |
t4150 (am): futureproof against failing tests
Most tests in t4150 begin by navigating to a sane state and
applying some patch:
git checkout first &&
git am patch1
If a previous test left behind unmerged files or a .git/rebase-apply
directory, they are untouched and the test fails, causing later tests
to fail, too. This is not a problem in practice because none of the
tests leave a mess behind.
But as a futureproofing measure, it is still best to avoid the problem
and clean up at the start of each test. In particular, this
simplifies the process of adding new tests that are known to fail.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Most tests in t4150 begin by navigating to a sane state and
applying some patch:
git checkout first &&
git am patch1
If a previous test left behind unmerged files or a .git/rebase-apply
directory, they are untouched and the test fails, causing later tests
to fail, too. This is not a problem in practice because none of the
tests leave a mess behind.
But as a futureproofing measure, it is still best to avoid the problem
and clean up at the start of each test. In particular, this
simplifies the process of adding new tests that are known to fail.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t4150-am.sh | diffblobblamehistory |