summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorDuy Nguyen <pclouds@gmail.com>2016-01-21 18:48:44 +0700
committerJunio C Hamano <gitster@pobox.com>2016-01-21 10:45:13 -0800
commita97262c62f1a31fcc7edf7629d313058bc7d66b5 (patch)
tree96f459828c6adbb05998b7fca180fef22bf41a7f /t
parente5f7a5d16f2c890e7dda96e5681ee8f6687b45e4 (diff)
downloadgit-a97262c62f1a31fcc7edf7629d313058bc7d66b5.tar.gz
diff: make -O and --output work in subdirectorynd/diff-with-path-params
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t4056-diff-order.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t4056-diff-order.sh b/t/t4056-diff-order.sh
index c0460bb0e5..43dd474a12 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)" '