summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-06-22 07:44:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-06-22 07:44:34 (GMT)
commit916e1373fb86db9d7019de4e7e74e39c9474a153 (patch)
tree05c0f822d2e10792fecac4df14fba526296cf48e
parente16a4779b3213f5f734da38a414ec06882400742 (diff)
parent1ab012cf811abba5745fa0da70db963decd65f21 (diff)
downloadgit-916e1373fb86db9d7019de4e7e74e39c9474a153.zip
git-916e1373fb86db9d7019de4e7e74e39c9474a153.tar.gz
git-916e1373fb86db9d7019de4e7e74e39c9474a153.tar.bz2
Merge branch 'maint'
* maint: t3700-add: add a POSIXPERM prerequisite to a new test
-rwxr-xr-xt/t3700-add.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index 6ae5a2c..85eb0fb 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -223,7 +223,7 @@ test_expect_success POSIXPERM 'git add (add.ignore-errors = false)' '
'
rm -f foo2
-test_expect_success '--no-ignore-errors overrides config' '
+test_expect_success POSIXPERM '--no-ignore-errors overrides config' '
git config add.ignore-errors 1 &&
git reset --hard &&
date >foo1 &&