Merge branch 'mk/maint-graph-infinity-loop'
authorJunio C Hamano <gitster@pobox.com>
Wed, 2 Jan 2013 18:39:09 +0000 (10:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 Jan 2013 18:39:09 +0000 (10:39 -0800)
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

1  2 
graph.c
t/t4202-log.sh

diff --cc graph.c
Simple merge
diff --cc t/t4202-log.sh
Simple merge