Google Git
Sign in
googlers / jrn / git / 60646e9a7170750093599fc52ad56453fc516185
commit60646e9a7170750093599fc52ad56453fc516185[log] [tgz]
authorJon Seymour <jon.seymour@gmail.com>Wed Jun 22 01:58:46 2005 +1000
committerLinus Torvalds <torvalds@ppc970.osdl.org>Wed Jun 22 17:54:44 2005 -0700
tree72330cc49cb47982e6339822ac24823bacc2f049
parentbac15c454ecc8ee0824451ffdd5406150714c432 [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>
1 file changed
tree: 72330cc49cb47982e6339822ac24823bacc2f049
  1. Documentation/
  2. mozilla-sha1/
  3. ppc/
  4. t/
  5. apply.c
  6. blob.c
  7. blob.h
  8. cache.h
  9. cat-file.c
  10. check-files.c
  11. checkout-cache.c
  12. commit-tree.c
  13. commit.c
  14. commit.h
  15. convert-cache.c
  16. COPYING
  17. count-delta.c
  18. count-delta.h
  19. cvs2git.c
  20. date.c
  21. delta.c
  22. delta.h
  23. diff-cache.c
  24. diff-delta.c
  25. diff-files.c
  26. diff-helper.c
  27. diff-stages.c
  28. diff-tree.c
  29. diff.c
  30. diff.h
  31. diffcore-break.c
  32. diffcore-order.c
  33. diffcore-pathspec.c
  34. diffcore-pickaxe.c
  35. diffcore-rename.c
  36. diffcore.h
  37. entry.c
  38. epoch.c
  39. epoch.h
  40. export.c
  41. fsck-cache.c
  42. get-tar-commit-id.c
  43. git
  44. git-add-script
  45. git-apply-patch-script
  46. git-checkout-script
  47. git-commit-script
  48. git-cvsimport-script
  49. git-deltafy-script
  50. git-diff-script
  51. git-external-diff-script
  52. git-fetch-script
  53. git-log-script
  54. git-merge-one-file-script
  55. git-prune-script
  56. git-pull-script
  57. git-reset-script
  58. git-resolve-script
  59. git-shortlog
  60. git-status-script
  61. git-tag-script
  62. git-whatchanged
  63. gitenv.c
  64. gitk
  65. http-pull.c
  66. index.c
  67. init-db.c
  68. INSTALL
  69. local-pull.c
  70. ls-files.c
  71. ls-tree.c
  72. Makefile
  73. merge-base.c
  74. merge-cache.c
  75. mkdelta.c
  76. mktag.c
  77. object.c
  78. object.h
  79. patch-delta.c
  80. pull.c
  81. pull.h
  82. read-cache.c
  83. read-tree.c
  84. README
  85. refs.c
  86. refs.h
  87. rev-list.c
  88. rev-parse.c
  89. rev-tree.c
  90. rsh.c
  91. rsh.h
  92. sha1_file.c
  93. ssh-pull.c
  94. ssh-push.c
  95. strbuf.c
  96. strbuf.h
  97. stripspace.c
  98. tag.c
  99. tag.h
  100. tar-tree.c
  101. test-date.c
  102. test-delta.c
  103. tree.c
  104. tree.h
  105. unpack-file.c
  106. update-cache.c
  107. usage.c
  108. write-blob.c
  109. write-tree.c