aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2009-05-25 14:07:55 +0200
committerJunio C Hamano <gitster@pobox.com>2009-05-25 11:23:30 -0700
commit32a90233d147bd697b338326bd1fabf9edc3f1fe (patch)
treecc581663fcadb7bb399cee20b28a2cade775b29a
parent7a26e653929025e11e689bc7d98365c9a0107dc9 (diff)
downloadgit-32a90233d147bd697b338326bd1fabf9edc3f1fe.tar.gz
git-32a90233d147bd697b338326bd1fabf9edc3f1fe.tar.xz
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 <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t3701-add-interactive.sh6
1 files changed, 6 insertions, 0 deletions
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 <<EOF
index 180b47c..b6f2c08 100644