Google Git
Sign in
googlers / jrn / git / eff19d5eccd02341a25f1543ff89fa7351163e3f
commiteff19d5eccd02341a25f1543ff89fa7351163e3f[log] [tgz]
authorJon Seymour <jon.seymour@gmail.com>Mon Jun 20 12:29:36 2005 +1000
committerLinus Torvalds <torvalds@ppc970.osdl.org>Sun Jun 19 20:13:18 2005 -0700
tree6c8c5672eabf7e4d3455a5604c37e988ca0e7cc2
parentc3c1163137b0b1bbe1edf9da0421832e452c7a10 [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>
1 file changed
tree: 6c8c5672eabf7e4d3455a5604c37e988ca0e7cc2
  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-commit-script
  47. git-cvsimport-script
  48. git-deltafy-script
  49. git-diff-script
  50. git-external-diff-script
  51. git-fetch-script
  52. git-log-script
  53. git-merge-one-file-script
  54. git-prune-script
  55. git-pull-script
  56. git-reset-script
  57. git-resolve-script
  58. git-shortlog
  59. git-status-script
  60. git-tag-script
  61. git-whatchanged
  62. gitenv.c
  63. http-pull.c
  64. index.c
  65. init-db.c
  66. INSTALL
  67. local-pull.c
  68. ls-files.c
  69. ls-tree.c
  70. Makefile
  71. merge-base.c
  72. merge-cache.c
  73. mkdelta.c
  74. mktag.c
  75. object.c
  76. object.h
  77. patch-delta.c
  78. pull.c
  79. pull.h
  80. read-cache.c
  81. read-tree.c
  82. README
  83. refs.c
  84. refs.h
  85. rev-list.c
  86. rev-parse.c
  87. rev-tree.c
  88. rsh.c
  89. rsh.h
  90. sha1_file.c
  91. ssh-pull.c
  92. ssh-push.c
  93. strbuf.c
  94. strbuf.h
  95. stripspace.c
  96. tag.c
  97. tag.h
  98. tar-tree.c
  99. test-date.c
  100. test-delta.c
  101. tree.c
  102. tree.h
  103. unpack-file.c
  104. update-cache.c
  105. usage.c
  106. write-blob.c
  107. write-tree.c