Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
checkout -m path: fix recreating conflicts
[gitweb.git]
/
t
/
t4128-apply-root.sh
diff --git
a/t/t4128-apply-root.sh
b/t/t4128-apply-root.sh
index bc7a8a8689c8ca2b9902c577c9d9bdd1fa97815c..8f6aea48d84621ae3b7304636452c724a4bbe5b6 100755
(executable)
--- a/
t/t4128-apply-root.sh
+++ b/
t/t4128-apply-root.sh
@@
-72,7
+72,7
@@
test_expect_success 'apply --directory (delete file)' '
echo content >some/sub/dir/delfile &&
git add some/sub/dir/delfile &&
git apply --directory=some/sub/dir/ --index patch &&
- !
git ls-files | grep delfile
+ !
(git ls-files | grep delfile)
'
cat > patch << 'EOF'