Google Git
Sign in
googlers / jrn / git / f0b75fcc810abaca317f7d82d25c538da95c6987
commitf0b75fcc810abaca317f7d82d25c538da95c6987[log] [tgz]
authorElijah Newren <newren@gmail.com>Thu Aug 11 23:19:39 2011 -0600
committerJunio C Hamano <gitster@pobox.com>Sun Aug 14 14:19:32 2011 -0700
treeb4f9ee58e7ff33c438765c26aaf7bac61f6aefb1
parentac6e839241009459b46e860f9d7fc524bb9ecc0b [diff]
t6042: Ensure rename/rename conflicts leave index and workdir in sane state

rename/rename conflicts, both with one file being renamed to two different
files and with two files being renamed to the same file, should leave the
index and the working copy in a sane state with appropriate conflict
recording, auxiliary files, etc.  Git seems to handle one of the two cases
alright, but has some problems with the two files being renamed to one
case.  Add tests for both cases.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 file changed
tree: b4f9ee58e7ff33c438765c26aaf7bac61f6aefb1
  1. block-sha1/
  2. builtin/
  3. compat/
  4. contrib/
  5. Documentation/
  6. git-gui/
  7. git_remote_helpers/
  8. gitk-git/
  9. gitweb/
  10. perl/
  11. po/
  12. ppc/
  13. t/
  14. templates/
  15. vcs-svn/
  16. xdiff/
  17. RelNotes ⇨ Documentation/RelNotes/1.7.5.4.txt
  18. .gitattributes
  19. .gitignore
  20. .mailmap
  21. abspath.c
  22. aclocal.m4
  23. advice.c
  24. advice.h
  25. alias.c
  26. alloc.c
  27. archive-tar.c
  28. archive-zip.c
  29. archive.c
  30. archive.h
  31. attr.c
  32. attr.h
  33. base85.c
  34. bisect.c
  35. bisect.h
  36. blob.c
  37. blob.h
  38. branch.c
  39. branch.h
  40. builtin.h
  41. bundle.c
  42. bundle.h
  43. cache-tree.c
  44. cache-tree.h
  45. cache.h
  46. check-builtins.sh
  47. check-racy.c
  48. check_bindir
  49. color.c
  50. color.h
  51. combine-diff.c
  52. command-list.txt
  53. commit.c
  54. commit.h
  55. config.c
  56. config.mak.in
  57. configure.ac
  58. connect.c
  59. convert.c
  60. copy.c
  61. COPYING
  62. csum-file.c
  63. csum-file.h
  64. ctype.c
  65. daemon.c
  66. date.c
  67. decorate.c
  68. decorate.h
  69. delta.h
  70. diff-delta.c
  71. diff-lib.c
  72. diff-no-index.c
  73. diff.c
  74. diff.h
  75. diffcore-break.c
  76. diffcore-delta.c
  77. diffcore-order.c
  78. diffcore-pickaxe.c
  79. diffcore-rename.c
  80. diffcore.h
  81. dir.c
  82. dir.h
  83. editor.c
  84. entry.c
  85. environment.c
  86. exec_cmd.c
  87. exec_cmd.h
  88. fast-import.c
  89. fetch-pack.h
  90. fixup-builtins
  91. fsck.c
  92. fsck.h
  93. generate-cmdlist.sh
  94. gettext.c
  95. gettext.h
  96. git-add--interactive.perl
  97. git-am.sh
  98. git-archimport.perl
  99. git-bisect.sh
  100. git-compat-util.h
  101. git-cvsexportcommit.perl
  102. git-cvsimport.perl
  103. git-cvsserver.perl
  104. git-difftool--helper.sh
  105. git-difftool.perl
  106. git-filter-branch.sh
  107. git-instaweb.sh
  108. git-lost-found.sh
  109. git-merge-octopus.sh
  110. git-merge-one-file.sh
  111. git-merge-resolve.sh
  112. git-mergetool--lib.sh
  113. git-mergetool.sh
  114. git-parse-remote.sh
  115. git-pull.sh
  116. git-quiltimport.sh
  117. git-rebase--interactive.sh
  118. git-rebase.sh
  119. git-relink.perl
  120. git-remote-testgit.py
  121. git-repack.sh
  122. git-request-pull.sh
  123. git-send-email.perl
  124. git-sh-setup.sh
  125. git-stash.sh
  126. git-submodule.sh
  127. git-svn.perl
  128. GIT-VERSION-GEN
  129. git-web--browse.sh
  130. git.c
  131. git.spec.in
  132. graph.c
  133. graph.h
  134. grep.c
  135. grep.h
  136. hash.c
  137. hash.h
  138. help.c
  139. help.h
  140. hex.c
  141. http-backend.c
  142. http-fetch.c
  143. http-push.c
  144. http-walker.c
  145. http.c
  146. http.h
  147. ident.c
  148. imap-send.c
  149. INSTALL
  150. levenshtein.c
  151. levenshtein.h
  152. LGPL-2.1
  153. list-objects.c
  154. list-objects.h
  155. ll-merge.c
  156. ll-merge.h
  157. lockfile.c
  158. log-tree.c
  159. log-tree.h
  160. mailmap.c
  161. mailmap.h
  162. Makefile
  163. match-trees.c
  164. merge-file.c
  165. merge-recursive.c
  166. merge-recursive.h
  167. name-hash.c
  168. notes-cache.c
  169. notes-cache.h
  170. notes-merge.c
  171. notes-merge.h
  172. notes.c
  173. notes.h
  174. object.c
  175. object.h
  176. pack-check.c
  177. pack-refs.c
  178. pack-refs.h
  179. pack-revindex.c
  180. pack-revindex.h
  181. pack-write.c
  182. pack.h
  183. pager.c
  184. parse-options.c
  185. parse-options.h
  186. patch-delta.c
  187. patch-ids.c
  188. patch-ids.h
  189. path.c
  190. pkt-line.c
  191. pkt-line.h
  192. preload-index.c
  193. pretty.c
  194. progress.c
  195. progress.h
  196. quote.c
  197. quote.h
  198. reachable.c
  199. reachable.h
  200. read-cache.c
  201. README
  202. reflog-walk.c
  203. reflog-walk.h
  204. refs.c
  205. refs.h
  206. remote-curl.c
  207. remote.c
  208. remote.h
  209. replace_object.c
  210. rerere.c
  211. rerere.h
  212. resolve-undo.c
  213. resolve-undo.h
  214. revision.c
  215. revision.h
  216. run-command.c
  217. run-command.h
  218. send-pack.h
  219. server-info.c
  220. setup.c
  221. sha1-lookup.c
  222. sha1-lookup.h
  223. sha1_file.c
  224. sha1_name.c
  225. shallow.c
  226. shell.c
  227. shortlog.h
  228. show-index.c
  229. sideband.c
  230. sideband.h
  231. sigchain.c
  232. sigchain.h
  233. strbuf.c
  234. strbuf.h
  235. string-list.c
  236. string-list.h
  237. submodule.c
  238. submodule.h
  239. symlinks.c
  240. tag.c
  241. tag.h
  242. tar.h
  243. test-chmtime.c
  244. test-ctype.c
  245. test-date.c
  246. test-delta.c
  247. test-dump-cache-tree.c
  248. test-genrandom.c
  249. test-index-version.c
  250. test-line-buffer.c
  251. test-match-trees.c
  252. test-mktemp.c
  253. test-obj-pool.c
  254. test-parse-options.c
  255. test-path-utils.c
  256. test-run-command.c
  257. test-sha1.c
  258. test-sha1.sh
  259. test-sigchain.c
  260. test-string-pool.c
  261. test-subprocess.c
  262. test-svn-fe.c
  263. test-treap.c
  264. thread-utils.c
  265. thread-utils.h
  266. trace.c
  267. transport-helper.c
  268. transport.c
  269. transport.h
  270. tree-diff.c
  271. tree-walk.c
  272. tree-walk.h
  273. tree.c
  274. tree.h
  275. unimplemented.sh
  276. unpack-trees.c
  277. unpack-trees.h
  278. upload-pack.c
  279. url.c
  280. url.h
  281. usage.c
  282. userdiff.c
  283. userdiff.h
  284. utf8.c
  285. utf8.h
  286. walker.c
  287. walker.h
  288. wrap-for-bin.sh
  289. wrapper.c
  290. write_or_die.c
  291. ws.c
  292. wt-status.c
  293. wt-status.h
  294. xdiff-interface.c
  295. xdiff-interface.h
  296. zlib.c