projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bac15c4) | patch
[PATCH] Fix --merge-order unit test breaks introduced by 6c88be169881c9223532796bd225...
authorJon Seymour <jon.seymour@gmail.com>
Tue, 21 Jun 2005 15:58:46 +0000 (01:58 +1000)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 23 Jun 2005 00:54:44 +0000 (17:54 -0700)
commit60646e9a7170750093599fc52ad56453fc516185
tree72330cc49cb47982e6339822ac24823bacc2f049tree | snapshot
parentbac15c454ecc8ee0824451ffdd5406150714c432commit | diff
[PATCH] Fix --merge-order unit test breaks introduced by 6c88be169881c9223532796bd225e79afaa115e1

The sensible cleanup of the in-memory storage order of commit parents broke the --merge-order
code which was dependent on the previous behaviour of parse_commit().

This patch restores the correctness --merge-order behaviour by taking account of the
new behaviour of parse_commit.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
epoch.c diff | blob | history
The core git plumbing