diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-09-07 11:09:18 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-09-07 11:09:18 -0700 |
commit | 7764a3b35c53b6859963ddad92bfc90563ac8baa (patch) | |
tree | 2d0eaf020e1b06a608bfc0748368be7a511b7ae4 /t/t4202-log.sh | |
parent | 096bbd6537b8465d2123cea3361921793ce8a73a (diff) | |
parent | 003c84f6d2b9e9c4d5bbf5262cae994bac7190cb (diff) | |
download | git-7764a3b35c53b6859963ddad92bfc90563ac8baa.tar.gz |
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-x | t/t4202-log.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 31869dc0db..0baaad2a24 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 |