t/t6022: a new test for renaming merge.

This adds a couple of tests to cover the following renaming
merge cases:

 - one side renames and the other side does not, with and without
   content conflicts.

 - both side rename to the same path, with and without content
   conflicts.

The test setup also prepares a case in which both side rename to
different destination, but currently the code collapses these
destination paths and removes the original path, which may be
wrong.  The outcome of this case is not checked by the tests in
this round.

Signed-off-by: Junio C Hamano <junkio@cox.net>
1 file changed
tree: d73c55875616862da1471898b8b29003ccffe152
  1. .gitignore
  2. COPYING
  3. Documentation/
  4. INSTALL
  5. Makefile
  6. README
  7. apply.c
  8. arm/
  9. blob.c
  10. blob.h
  11. cache.h
  12. cat-file.c
  13. check-ref-format.c
  14. checkout-index.c
  15. clone-pack.c
  16. cmd-rename.sh
  17. commit-tree.c
  18. commit.c
  19. commit.h
  20. compat/
  21. config.c
  22. connect.c
  23. convert-objects.c
  24. copy.c
  25. count-delta.c
  26. count-delta.h
  27. csum-file.c
  28. csum-file.h
  29. ctype.c
  30. daemon.c
  31. date.c
  32. debian/
  33. delta.h
  34. diff-delta.c
  35. diff-files.c
  36. diff-index.c
  37. diff-stages.c
  38. diff-tree.c
  39. diff.c
  40. diff.h
  41. diffcore-break.c
  42. diffcore-order.c
  43. diffcore-pathspec.c
  44. diffcore-pickaxe.c
  45. diffcore-rename.c
  46. diffcore.h
  47. entry.c
  48. environment.c
  49. epoch.c
  50. epoch.h
  51. fetch-pack.c
  52. fetch.c
  53. fetch.h
  54. fsck-objects.c
  55. get-tar-commit-id.c
  56. git-add.sh
  57. git-am.sh
  58. git-applymbox.sh
  59. git-applypatch.sh
  60. git-archimport.perl
  61. git-bisect.sh
  62. git-branch.sh
  63. git-checkout.sh
  64. git-cherry.sh
  65. git-clone.sh
  66. git-commit.sh
  67. git-compat-util.h
  68. git-count-objects.sh
  69. git-cvsexportcommit.perl
  70. git-cvsimport.perl
  71. git-diff.sh
  72. git-fetch.sh
  73. git-fmt-merge-msg.perl
  74. git-format-patch.sh
  75. git-grep.sh
  76. git-log.sh
  77. git-lost-found.sh
  78. git-ls-remote.sh
  79. git-merge-octopus.sh
  80. git-merge-one-file.sh
  81. git-merge-ours.sh
  82. git-merge-recursive.py
  83. git-merge-resolve.sh
  84. git-merge-stupid.sh
  85. git-merge.sh
  86. git-mv.perl
  87. git-octopus.sh
  88. git-parse-remote.sh
  89. git-prune.sh
  90. git-pull.sh
  91. git-push.sh
  92. git-rebase.sh
  93. git-relink.perl
  94. git-repack.sh
  95. git-request-pull.sh
  96. git-reset.sh
  97. git-resolve.sh
  98. git-revert.sh
  99. git-send-email.perl
  100. git-sh-setup.sh
  101. git-shortlog.perl
  102. git-status.sh
  103. git-svnimport.perl
  104. git-tag.sh
  105. git-verify-tag.sh
  106. git-whatchanged.sh
  107. git.c
  108. git.spec.in
  109. gitMergeCommon.py
  110. gitk
  111. hash-object.c
  112. http-fetch.c
  113. http-push.c
  114. http.c
  115. http.h
  116. ident.c
  117. index-pack.c
  118. index.c
  119. init-db.c
  120. local-fetch.c
  121. ls-files.c
  122. ls-tree.c
  123. mailinfo.c
  124. mailsplit.c
  125. merge-base.c
  126. merge-index.c
  127. mktag.c
  128. mozilla-sha1/
  129. name-rev.c
  130. object.c
  131. object.h
  132. pack-check.c
  133. pack-objects.c
  134. pack-redundant.c
  135. pack.h
  136. patch-delta.c
  137. patch-id.c
  138. path.c
  139. peek-remote.c
  140. pkt-line.c
  141. pkt-line.h
  142. ppc/
  143. prune-packed.c
  144. quote.c
  145. quote.h
  146. read-cache.c
  147. read-tree.c
  148. receive-pack.c
  149. refs.c
  150. refs.h
  151. repo-config.c
  152. rev-list.c
  153. rev-parse.c
  154. rsh.c
  155. rsh.h
  156. run-command.c
  157. run-command.h
  158. send-pack.c
  159. server-info.c
  160. setup.c
  161. sha1_file.c
  162. sha1_name.c
  163. shell.c
  164. show-branch.c
  165. show-index.c
  166. ssh-fetch.c
  167. ssh-pull.c
  168. ssh-push.c
  169. ssh-upload.c
  170. strbuf.c
  171. strbuf.h
  172. stripspace.c
  173. symbolic-ref.c
  174. t/
  175. tag.c
  176. tag.h
  177. tar-tree.c
  178. templates/
  179. test-date.c
  180. test-delta.c
  181. tree-diff.c
  182. tree.c
  183. tree.h
  184. unpack-file.c
  185. unpack-objects.c
  186. update-index.c
  187. update-ref.c
  188. update-server-info.c
  189. upload-pack.c
  190. usage.c
  191. var.c
  192. verify-pack.c
  193. write-tree.c