Junio C Hamano <gitster@xxxxxxxxx> writes: > worley@xxxxxxxxxxxx (Dale R. Worley) writes: > >> I have found a situation where "git log" produces (apparently) >> endless output. Presumably this is a bug. Following is a (Linux) >> script that reliably reproduces the error for me (on Fedora 16): > > Wasn't this fixed at v1.8.1.1~13 or is this a different issue? In any case, I can't reproduce with 1.8.1.2.526.gf51a757: I don't get undless output. On the other hand, I get a slightly misformatted output: * commit a393ed598e9fb11436f85bd58f1a38c82f2cadb7 (from 2c1e6a36f4b712e914fac994463da7d0fdb2bc6d) |\ Merge: 2c1e6a3 33e70e7 | | Author: Matthieu Moy <Matthieu.Moy@xxxxxxx> | | Date: Tue Feb 5 22:05:33 2013 +0100 | | | | Commit S | | | | diff --git a/file b/file | | index 6bb4d3e..afd2e75 100644 | | --- a/file | | +++ b/file | | @@ -1,4 +1,5 @@ | | 1 | | 1a | | 2 | | +2a | | 3 | | commit a393ed598e9fb11436f85bd58f1a38c82f2cadb7 (from 33e70e70c0173d634826b998bdc304f93c0966b8) | | Merge: 2c1e6a3 33e70e7 | | Author: Matthieu Moy <Matthieu.Moy@xxxxxxx> | | Date: Tue Feb 5 22:05:33 2013 +0100 The second "commit" line (diff with second parent) doesn't have the "| |" prefix, I don't think this is intentional. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html