diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-11-06 18:52:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-11-06 18:52:37 (GMT) |
| commit | 64b9326460e066a6ae598ed53f38bec8ab4e577d (patch) | |
| tree | b93c89853841a3adf7d7b29f30297ba0cffe1ea4 /t | |
| parent | a1671dd82b5e1c6e837a3f47509a3a33189b0884 (diff) | |
| parent | a8787c5c1c51f4bdb610526175442a23eea7c467 (diff) | |
| download | git-64b9326460e066a6ae598ed53f38bec8ab4e577d.zip git-64b9326460e066a6ae598ed53f38bec8ab4e577d.tar.gz git-64b9326460e066a6ae598ed53f38bec8ab4e577d.tar.bz2 | |
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')
| -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 7369d3c..0901b30 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 |