From: Johannes Sixt Date: Mon, 25 May 2009 12:07:55 +0000 (+0200) Subject: t3701: ensure correctly set up repository after skipped tests X-Git-Tag: v1.6.3.2~8^2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=32a90233d147bd697b338326bd1fabf9edc3f1fe;p=git.git t3701: ensure correctly set up repository after skipped tests There are two tests that are skipped if file modes are not obeyed by the file system. In this case, the subsequent test failed because the repository was in an unexpected state. This corrects it. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano --- diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh index 5cdb83d28..fd2a55a5c 100755 --- a/t/t3701-add-interactive.sh +++ b/t/t3701-add-interactive.sh @@ -165,6 +165,12 @@ test_expect_success FILEMODE 'stage mode but not hunk' ' # end of tests disabled when filemode is not usable +test_expect_success 'setup again' ' + git reset --hard && + test_chmod +x file && + echo content >>file +' + # Write the patch file with a new line at the top and bottom cat >patch <