diff options
| author | Michał Kiedrowicz <michal.kiedrowicz@gmail.com> | 2009-07-25 01:45:00 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-25 11:07:15 -0700 |
| commit | 656197ad380506ca0e8a0355701f9d9a4a398f66 (patch) | |
| tree | 25e0cd38fc65b43709f3c1665dbb558e3c2652cc /t/t4202-log.sh | |
| parent | 0ce2e396ee9fb0fa07e8381b338e49859dbf03db (diff) | |
| download | git-656197ad380506ca0e8a0355701f9d9a4a398f66.tar.gz | |
graph.c: infinite loop in git whatchanged --graph -m
Running "whatchanged --graph -m" on a simple two-head merges
can fall into infinite loop.
Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4202-log.sh')
| -rwxr-xr-x | t/t4202-log.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 71be59d446..14f73e3bac 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -264,6 +264,16 @@ test_expect_success 'log --graph with merge' ' test_cmp expect actual ' +test_expect_success 'log --raw --graph -m with merge' ' + git log --raw --graph --oneline -m master | head -n 500 >actual && + grep "initial" actual +' + +test_expect_success 'diff-tree --graph' ' + git diff-tree --graph master^ | head -n 500 >actual && + grep "one" actual +' + cat > expect <<\EOF * commit master |\ Merge: A B |