Google Git
Sign in
googlers / jrn / git / 4d3a63ba3a1f80e03312c5ec28734b27583a0756
commit4d3a63ba3a1f80e03312c5ec28734b27583a0756[log] [tgz]
authorJon Seymour <jon.seymour@gmail.com>Thu Jul 07 02:39:35 2005 +1000
committerLinus Torvalds <torvalds@g5.osdl.org>Wed Jul 06 10:29:30 2005 -0700
tree89513c5711d595b95539fbe8264d59c51b58117a
parentd2775a817a19d966ec35a1da9440e2feb55276f4 [diff]
[PATCH] Add a t/t6001 test case for a --merge-order bug

This test case demonstrates a problem with --merge-order.

A
|
B
|\
C D
|/
E
|
F

git-rev-list --merge-order A B doesn't produce the expected output of

A
B
D
C
E
F

The problem is fixed by a subsequent patch.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
1 file changed
tree: 89513c5711d595b95539fbe8264d59c51b58117a
  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. clone-pack.c
  13. commit-tree.c
  14. commit.c
  15. commit.h
  16. connect.c
  17. convert-cache.c
  18. COPYING
  19. count-delta.c
  20. count-delta.h
  21. csum-file.c
  22. csum-file.h
  23. date.c
  24. delta.h
  25. diff-cache.c
  26. diff-delta.c
  27. diff-files.c
  28. diff-helper.c
  29. diff-stages.c
  30. diff-tree.c
  31. diff.c
  32. diff.h
  33. diffcore-break.c
  34. diffcore-order.c
  35. diffcore-pathspec.c
  36. diffcore-pickaxe.c
  37. diffcore-rename.c
  38. diffcore.h
  39. entry.c
  40. epoch.c
  41. epoch.h
  42. export.c
  43. fetch-pack.c
  44. fsck-cache.c
  45. get-tar-commit-id.c
  46. git
  47. git-add-script
  48. git-apply-patch-script
  49. git-checkout-script
  50. git-cherry
  51. git-clone-script
  52. git-commit-script
  53. git-cvsimport-script
  54. git-diff-script
  55. git-external-diff-script
  56. git-fetch-script
  57. git-log-script
  58. git-merge-one-file-script
  59. git-prune-script
  60. git-pull-script
  61. git-rebase-script
  62. git-relink-script
  63. git-repack-script
  64. git-reset-script
  65. git-resolve-script
  66. git-shortlog
  67. git-status-script
  68. git-tag-script
  69. git-verify-tag-script
  70. git-whatchanged
  71. gitenv.c
  72. gitk
  73. http-pull.c
  74. index.c
  75. init-db.c
  76. INSTALL
  77. local-pull.c
  78. ls-files.c
  79. ls-tree.c
  80. Makefile
  81. merge-base.c
  82. merge-cache.c
  83. mktag.c
  84. object.c
  85. object.h
  86. pack-check.c
  87. pack-objects.c
  88. pack.h
  89. patch-delta.c
  90. patch-id.c
  91. pkt-line.c
  92. pkt-line.h
  93. prune-packed.c
  94. pull.c
  95. pull.h
  96. read-cache.c
  97. read-tree.c
  98. README
  99. receive-pack.c
  100. refs.c
  101. refs.h
  102. rev-list.c
  103. rev-parse.c
  104. rev-tree.c
  105. rsh.c
  106. rsh.h
  107. send-pack.c
  108. sha1_file.c
  109. show-index.c
  110. ssh-pull.c
  111. ssh-push.c
  112. strbuf.c
  113. strbuf.h
  114. stripspace.c
  115. tag.c
  116. tag.h
  117. tar-tree.c
  118. test-date.c
  119. test-delta.c
  120. tree.c
  121. tree.h
  122. unpack-file.c
  123. unpack-objects.c
  124. update-cache.c
  125. upload-pack.c
  126. usage.c
  127. verify-pack.c
  128. write-blob.c
  129. write-tree.c