![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Jon Seymour <jon.seymour@gmail.com> | |
| Mon, 20 Jun 2005 02:29:36 +0000 (12:29 +1000) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Mon, 20 Jun 2005 03:13:18 +0000 (20:13 -0700) | ||
| commit | eff19d5eccd02341a25f1543ff89fa7351163e3f | |
| tree | 6c8c5672eabf7e4d3455a5604c37e988ca0e7cc2 | tree | snapshot |
| parent | c3c1163137b0b1bbe1edf9da0421832e452c7a10 | commit | diff |
[PATCH] Prevent git-rev-list --merge-order producing duplicates in the output
If a is reachable from b, then git-rev-list --merge-order b a would
produce a duplicate output of b.
This causes a problem for an upcoming version of gitk since it
breaks the --merge-order ordering invariant.
This patch fixes the problem for the --merge-order switch. A subsequent
patch will fix the problem for the non --merge-order switch.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
If a is reachable from b, then git-rev-list --merge-order b a would
produce a duplicate output of b.
This causes a problem for an upcoming version of gitk since it
breaks the --merge-order ordering invariant.
This patch fixes the problem for the --merge-order switch. A subsequent
patch will fix the problem for the non --merge-order switch.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| epoch.c | diff | blob | history |