summaryrefslogtreecommitdiff
path: root/fsck-cache.c
diff options
context:
space:
mode:
authorJon Seymour <jon.seymour@gmail.com>2005-06-21 15:58:46 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-23 00:54:44 (GMT)
commit60646e9a7170750093599fc52ad56453fc516185 (patch)
tree72330cc49cb47982e6339822ac24823bacc2f049 /fsck-cache.c
parentbac15c454ecc8ee0824451ffdd5406150714c432 (diff)
downloadgit-60646e9a7170750093599fc52ad56453fc516185.zip
git-60646e9a7170750093599fc52ad56453fc516185.tar.gz
git-60646e9a7170750093599fc52ad56453fc516185.tar.bz2
[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>
Diffstat (limited to 'fsck-cache.c')
0 files changed, 0 insertions, 0 deletions