diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-06 18:36:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-06 19:33:08 -0700 |
| commit | f55638874774acc1e13a046353449ebc8734ab08 (patch) | |
| tree | ec45c4c37712d651ec7caa1100aaddd4d7c96944 /t | |
| parent | 8ee4a6c2ec6738cfbc815dc59e44825f2a9b9f15 (diff) | |
| download | git-f55638874774acc1e13a046353449ebc8734ab08.tar.gz git-f55638874774acc1e13a046353449ebc8734ab08.tar.xz | |
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')
| -rwxr-xr-x | t/t4128-apply-root.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t4128-apply-root.sh b/t/t4128-apply-root.sh index b65024545..2dd0c75f9 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) |