summaryrefslogtreecommitdiff
path: root/t/t4202-log.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-07 18:09:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-09-07 18:09:18 (GMT)
commit7764a3b35c53b6859963ddad92bfc90563ac8baa (patch)
tree2d0eaf020e1b06a608bfc0748368be7a511b7ae4 /t/t4202-log.sh
parent096bbd6537b8465d2123cea3361921793ce8a73a (diff)
parent003c84f6d2b9e9c4d5bbf5262cae994bac7190cb (diff)
downloadgit-7764a3b35c53b6859963ddad92bfc90563ac8baa.zip
git-7764a3b35c53b6859963ddad92bfc90563ac8baa.tar.gz
git-7764a3b35c53b6859963ddad92bfc90563ac8baa.tar.bz2
Merge branch 'jc/dotdot-is-parent-directory'
"git log .." errored out saying it is both rev range and a path when there is no disambiguating "--" is on the command line. Update the command line parser to interpret ".." as a path in such a case. * jc/dotdot-is-parent-directory: specifying ranges: we did not mean to make ".." an empty set
Diffstat (limited to 't/t4202-log.sh')
-rwxr-xr-xt/t4202-log.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 31869dc..0baaad2 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -806,4 +806,11 @@ test_expect_success 'log --graph with diff and stats' '
test_i18ncmp expect actual.sanitized
'
+test_expect_success 'dotdot is a parent directory' '
+ mkdir -p a/b &&
+ ( echo sixth && echo fifth ) >expect &&
+ ( cd a/b && git log --format=%s .. ) >actual &&
+ test_cmp expect actual
+'
+
test_done