mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Tweaked --merge-order --show-breaks output in case specified head has no parent

Browse Source 
git-rev-list --merge-order --show-breaks root

Was outputing:

| root

It now outputs:

= root

Which is consistent with the behaviour of other cases.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jon Seymour
2005-06-20 12:29:29 +10:00
committed by Linus Torvalds
parent dec5eda786
commit 8cd1033e10
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
epoch.c
View File

@ -536,6 +536,8 @@ static int sort_in_merge_order(struct commit *head_of_epoch, emitter_func emitte
ret = parse_commit(head_of_epoch);
next->object.flags |= BOUNDARY;
while (next && next->parents && !ret && (action != STOP)) {
struct commit *base = NULL;