Browse Source

[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>
maint
Jon Seymour 20 years ago committed by Linus Torvalds
parent
commit
d6bd56a0e2
  1. 4
      epoch.c

4
epoch.c

@ -606,7 +606,9 @@ int sort_list_in_merge_order(struct commit_list *list, emitter_func emitter) @@ -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.

Loading…
Cancel
Save