summaryrefslogtreecommitdiff
path: root/t/t4013
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-01-23 19:04:48 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-01-23 19:04:48 -0800
commitf630171d9d1839669446506aff0704a4dfe98b99 (patch)
tree6fbf9fbff5cdf5b1ad1df6147090ce5f131a543c /t/t4013
parentMerge branch 'rs/maint-shortlog-foldline' into maint (diff)
parentdiff --no-index -q: fix endless loop (diff)
downloadtgif-f630171d9d1839669446506aff0704a4dfe98b99.tar.xz
Merge branch 'tr/maint-no-index-fixes' into maint
* tr/maint-no-index-fixes: diff --no-index -q: fix endless loop diff --no-index: test for pager after option parsing diff: accept -- when using --no-index
Diffstat (limited to 't/t4013')
-rw-r--r--t/t4013/diff.diff_--no-index_--name-status_--_dir2_dir3
1 files changed, 3 insertions, 0 deletions
diff --git a/t/t4013/diff.diff_--no-index_--name-status_--_dir2_dir b/t/t4013/diff.diff_--no-index_--name-status_--_dir2_dir
new file mode 100644
index 0000000000..6756f8de67
--- /dev/null
+++ b/t/t4013/diff.diff_--no-index_--name-status_--_dir2_dir
@@ -0,0 +1,3 @@
+$ git diff --no-index --name-status -- dir2 dir
+A dir/sub
+$