[PATCH] Fixes problem with --merge-order head ^head

git-rev-list --merge-order HEAD ^HEAD was faulting rather than generating an empty output.

This patch fixes that problem.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/epoch.c b/epoch.c
index 5b71ad50d803a87e297761fe3c7a5123de63e580..82becf677ba852cf103a9f9a1131dc54141f019f 100644 (file)
--- a/epoch.c
+++ b/epoch.c
@@ -606,7 +606,9 @@ int sort_list_in_merge_order(struct commit_list *list, emitter_func emitter)
                }
        }
 
-       if (!reversed->next) {
+       if (!reversed)
+               return ret;
+       else if (!reversed->next) {
                /*
                 * If there is only one element in the list, we can sort it
                 * using sort_in_merge_order.