Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'rs/t3700-clean-leftover' into maint
author
Junio C Hamano
<gitster@pobox.com>
Sun, 10 Sep 2017 08:02:58 +0000
(17:02 +0900)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 10 Sep 2017 08:02:58 +0000
(17:02 +0900)
A test fix.
* rs/t3700-clean-leftover:
t3700: fix broken test under !POSIXPERM
t/t3700-add.sh
patch
|
blob
|
history
raw
(from parent 1:
8f3d48e
)
diff --git
a/t/t3700-add.sh
b/t/t3700-add.sh
index f3a4b4a913f344ce140344ec7b70482a6d36bcbe..0aae21d6984bf0bd5c7c7de425a021da6122beee 100755
(executable)
--- a/
t/t3700-add.sh
+++ b/
t/t3700-add.sh
@@
-356,6
+356,7
@@
test_expect_success POSIXPERM,SYMLINKS 'git add --chmod=+x with symlinks' '
test_expect_success 'git add --chmod=[+-]x changes index with already added file' '
rm -f foo3 xfoo3 &&
+ git reset --hard &&
echo foo >foo3 &&
git add foo3 &&
git add --chmod=+x foo3 &&