summaryrefslogtreecommitdiff
path: root/t/t4128-apply-root.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-07 01:36:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-07 02:33:08 (GMT)
commitf55638874774acc1e13a046353449ebc8734ab08 (patch)
treeec45c4c37712d651ec7caa1100aaddd4d7c96944 /t/t4128-apply-root.sh
parent8ee4a6c2ec6738cfbc815dc59e44825f2a9b9f15 (diff)
downloadgit-f55638874774acc1e13a046353449ebc8734ab08.zip
git-f55638874774acc1e13a046353449ebc8734ab08.tar.gz
git-f55638874774acc1e13a046353449ebc8734ab08.tar.bz2
git-apply --directory: make --root more similar to GNU diff
Applying a patch in the directory that is different from what the patch records is done with --directory option in GNU diff. The --root option we introduced previously does the same, and we can call it the same way to give users more familiar feel. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4128-apply-root.sh')
-rwxr-xr-xt/t4128-apply-root.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t4128-apply-root.sh b/t/t4128-apply-root.sh
index b650245..2dd0c75 100755
--- a/t/t4128-apply-root.sh
+++ b/t/t4128-apply-root.sh
@@ -23,18 +23,18 @@ diff a/bla/blub/dir/file b/bla/blub/dir/file
+Bello
EOF
-test_expect_success 'apply --root -p (1)' '
+test_expect_success 'apply --directory -p (1)' '
- git apply --root=some/sub -p3 --index patch &&
+ git apply --directory=some/sub -p3 --index patch &&
test Bello = $(git show :some/sub/dir/file) &&
test Bello = $(cat some/sub/dir/file)
'
-test_expect_success 'apply --root -p (2) ' '
+test_expect_success 'apply --directory -p (2) ' '
git reset --hard initial &&
- git apply --root=some/sub/ -p3 --index patch &&
+ git apply --directory=some/sub/ -p3 --index patch &&
test Bello = $(git show :some/sub/dir/file) &&
test Bello = $(cat some/sub/dir/file)