diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-11-06 19:52:36 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-11-06 19:52:37 +0100 |
| commit | 64b9326460e066a6ae598ed53f38bec8ab4e577d (patch) | |
| tree | b93c89853841a3adf7d7b29f30297ba0cffe1ea4 /t/t4211-line-log.sh | |
| parent | Merge branch 'jk/fetch-reflog-df-conflict' (diff) | |
| parent | line-log: fix crash when --first-parent is used (diff) | |
| download | git-64b9326460e066a6ae598ed53f38bec8ab4e577d.tar.xz git-64b9326460e066a6ae598ed53f38bec8ab4e577d.zip | |
Merge branch 'tm/line-log-first-parent'
"git log --first-parent -L..." used to crash.
* tm/line-log-first-parent:
line-log: fix crash when --first-parent is used
Diffstat (limited to 't/t4211-line-log.sh')
| -rwxr-xr-x | t/t4211-line-log.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh index 7369d3c517..0901b30982 100755 --- a/t/t4211-line-log.sh +++ b/t/t4211-line-log.sh @@ -94,4 +94,9 @@ test_expect_success '-L ,Y (Y == nlines + 2)' ' test_must_fail git log -L ,$n:b.c ' +test_expect_success '-L with --first-parent and a merge' ' + git checkout parallel-change && + git log --first-parent -L 1,1:b.c +' + test_done |