| commit | 18c8ff46104302ea30e879a0f2cb5eefb94df1a4 | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Mon, 14 Jun 2010 05:28:50 +0000 (14 00:28 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 14 Jun 2010 17:32:02 +0000 (14 10:32 -0700) | ||
| tree | 6d18767b4cc22a3c2397bd86c1f6e9e70cd1a79f | treesnapshot (tar.gz zip) |
| parent | 86c7bb47c76948bd1240a0db5b8dd88cf9db855d | commitdiff |
t3508 (cherry-pick): futureproof against unmerged files
Each of the tests in t3508 begins by navigating to a sane state:
git checkout master &&
git reset --hard $commit
If a previous test left unmerged files around, they are untouched and
the checkout fails, causing later tests to fail, too. This is not a
problem in practice because no test except the final one produces
unmerged files.
But as a futureproofing measure, it is still best to avoid the problem
with 'checkout -f'. In particular, this is needed for new tests to be
added to the end of the script.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Each of the tests in t3508 begins by navigating to a sane state:
git checkout master &&
git reset --hard $commit
If a previous test left unmerged files around, they are untouched and
the checkout fails, causing later tests to fail, too. This is not a
problem in practice because no test except the final one produces
unmerged files.
But as a futureproofing measure, it is still best to avoid the problem
with 'checkout -f'. In particular, this is needed for new tests to be
added to the end of the script.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t3508-cherry-pick-many-commits.sh | diffblobblamehistory |