mirror of
https://github.com/git/git
synced 2024-09-12 21:04:12 +00:00
33 lines
536 B
Bash
33 lines
536 B
Bash
|
#!/bin/sh
|
||
|
|
|
||
|
|
test_description='apply same filename'
|
||
|
|
|
||
|
|
. ./test-lib.sh
|
||
|
|
|
||
|
|
test_expect_success 'setup' '
|
||
|
|
|
||
|
|
mkdir -p some/sub/dir &&
|
||
|
|
echo Hello > some/sub/dir/file &&
|
||
|
|
git add some/sub/dir/file
|
||
|
|
|
||
|
|
'
|
||
|
|
|
||
|
|
cat > patch << EOF
|
||
|
|
diff a/bla/blub/dir/file b/bla/blub/dir/file
|
||
|
|
--- a/bla/blub/dir/file
|
||
|
|
+++ b/bla/blub/dir/file
|
||
|
|
@@ -1,1 +1,1 @@
|
||
|
|
-Hello
|
||
|
|
+Bello
|
||
|
|
EOF
|
||
|
|
|
||
|
|
test_expect_success 'apply --root -p --index' '
|
||
|
|
|
||
|
|
git apply --root=some/sub -p3 --index patch &&
|
||
|
|
test Bello = $(git show :some/sub/dir/file) &&
|
||
|
|
test Bello = $(cat some/sub/dir/file)
|
||
|
|
|
||
|
|
'
|
||
|
|
|
||
|
|
test_done
|