diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-03 22:16:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-03 22:16:04 (GMT) |
| commit | c167a96e68b9fb49cab7eb1f2814d7b32f7c0a1a (patch) | |
| tree | 9cd4964f51f8c32133d5e5cce34bedd86e11ee4d /t | |
| parent | 465c30a9c6f68c3bac25cd875624286baa37b41c (diff) | |
| parent | a97262c62f1a31fcc7edf7629d313058bc7d66b5 (diff) | |
| download | git-c167a96e68b9fb49cab7eb1f2814d7b32f7c0a1a.zip git-c167a96e68b9fb49cab7eb1f2814d7b32f7c0a1a.tar.gz git-c167a96e68b9fb49cab7eb1f2814d7b32f7c0a1a.tar.bz2 | |
Merge branch 'nd/diff-with-path-params'
A few options of "git diff" did not work well when the command was
run from a subdirectory.
* nd/diff-with-path-params:
diff: make -O and --output work in subdirectory
diff-no-index: do not take a redundant prefix argument
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4056-diff-order.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t4056-diff-order.sh b/t/t4056-diff-order.sh index c0460bb..43dd474 100755 --- a/t/t4056-diff-order.sh +++ b/t/t4056-diff-order.sh @@ -68,6 +68,12 @@ test_expect_success POSIXPERM,SANITY 'unreadable orderfile' ' test_must_fail git diff -Ounreadable_file --name-only HEAD^..HEAD ' +test_expect_success "orderfile using option from subdir with --output" ' + mkdir subdir && + git -C subdir diff -O../order_file_1 --output ../actual --name-only HEAD^..HEAD && + test_cmp expect_1 actual +' + for i in 1 2 do test_expect_success "orderfile using option ($i)" ' |