diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-02 10:39:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-02 10:39:09 -0800 |
| commit | 4b32367ddc63fc2a3e50986509f2f6323f227fef (patch) | |
| tree | 12d73c92bc668a397b048e26c2c9b2a271666007 /t/t4202-log.sh | |
| parent | 77ecfd02de5c8d9186ab1b3640da014e3f4bdada (diff) | |
| parent | 656197ad380506ca0e8a0355701f9d9a4a398f66 (diff) | |
| download | git-4b32367ddc63fc2a3e50986509f2f6323f227fef.tar.gz | |
Merge branch 'mk/maint-graph-infinity-loop'
The --graph code fell into infinite loop when asked to do what the
code did not expect.
* mk/maint-graph-infinity-loop:
graph.c: infinite loop in git whatchanged --graph -m
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 a343bf6c62..fa686b887d 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -280,6 +280,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 |