diff options
author | Jon Seymour <jon.seymour@gmail.com> | 2005-06-20 12:29:29 +1000 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-19 20:13:18 -0700 |
commit | 8cd1033e10b3d51d19676902bf522be15eb95751 (patch) | |
tree | 267a0d622b401347c400a5ae5b61465ba44dc45f /epoch.c | |
parent | dec5eda7860f6d8babf3fa14c00bc5e1d4e06b4f (diff) | |
download | git-8cd1033e10b3d51d19676902bf522be15eb95751.tar.gz git-8cd1033e10b3d51d19676902bf522be15eb95751.tar.xz |
[PATCH] Tweaked --merge-order --show-breaks output in case specified head has no parent
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>
Diffstat (limited to 'epoch.c')
-rw-r--r-- | epoch.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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; |