diff options
| author | Jon Seymour <jon.seymour@gmail.com> | 2005-06-20 12:29:31 +1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-19 20:13:18 -0700 |
| commit | d6bd56a0e2d710d17c9dc61cfc7fea1b8e3f4629 (patch) | |
| tree | d028a41c0029e447a691c40824aa13585a641d27 /epoch.c | |
| parent | 8cd1033e10b3d51d19676902bf522be15eb95751 (diff) | |
| download | git-d6bd56a0e2d710d17c9dc61cfc7fea1b8e3f4629.tar.gz | |
[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>
Diffstat (limited to 'epoch.c')
| -rw-r--r-- | epoch.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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. |