projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dec5eda
)
[PATCH] Tweaked --merge-order --show-breaks output in case specified head has no...
author
Jon Seymour
<jon.seymour@gmail.com>
Mon, 20 Jun 2005 02:29:29 +0000
(12:29 +1000)
committer
Linus Torvalds
<torvalds@ppc970.osdl.org>
Mon, 20 Jun 2005 03:13:18 +0000
(20:13 -0700)
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>
epoch.c
patch
|
blob
|
history
diff --git
a/epoch.c
b/epoch.c
index a4c82135b873c4e1153a930b692b79642cf96396..5b71ad50d803a87e297761fe3c7a5123de63e580 100644
(file)
--- a/
epoch.c
+++ b/
epoch.c
@@
-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;