Google Git
Sign in
googlers / jrn / git / b9dffd8cad737a07d6a05503318c6746ac593f9c
commitb9dffd8cad737a07d6a05503318c6746ac593f9c[log] [tgz]
authorEric Wong <normalperson@yhbt.net>Fri Feb 09 01:28:30 2007 -0800
committerEric Wong <normalperson@yhbt.net>Fri Feb 23 00:57:11 2007 -0800
tree735ee41949d15fb6b0d42b13a90e6834dbe800f9
parente518192f3be92097ba550098dbb69d769ca18429 [diff]
git-svn: --follow-parent tracks multi-parent paths

We can have a branch that was deleted, then re-added under the
same name but copied from another path, in which case we'll have
multiple parents (we don't want to break the original ref, nor
lose copypath info).

Add a test for this, too, of course.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
2 files changed
tree: 735ee41949d15fb6b0d42b13a90e6834dbe800f9
  1. arm/
  2. compat/
  3. contrib/
  4. Documentation/
  5. git-gui/
  6. gitweb/
  7. mozilla-sha1/
  8. perl/
  9. ppc/
  10. t/
  11. templates/
  12. xdiff/
  13. RelNotes ⇨ Documentation/RelNotes-1.5.1.txt
  14. .gitignore
  15. .mailmap
  16. alloc.c
  17. archive-tar.c
  18. archive-zip.c
  19. archive.h
  20. base85.c
  21. blob.c
  22. blob.h
  23. builtin-add.c
  24. builtin-annotate.c
  25. builtin-apply.c
  26. builtin-archive.c
  27. builtin-blame.c
  28. builtin-branch.c
  29. builtin-cat-file.c
  30. builtin-check-ref-format.c
  31. builtin-checkout-index.c
  32. builtin-commit-tree.c
  33. builtin-config.c
  34. builtin-count-objects.c
  35. builtin-describe.c
  36. builtin-diff-files.c
  37. builtin-diff-index.c
  38. builtin-diff-tree.c
  39. builtin-diff.c
  40. builtin-fmt-merge-msg.c
  41. builtin-for-each-ref.c
  42. builtin-fsck.c
  43. builtin-grep.c
  44. builtin-init-db.c
  45. builtin-log.c
  46. builtin-ls-files.c
  47. builtin-ls-tree.c
  48. builtin-mailinfo.c
  49. builtin-mailsplit.c
  50. builtin-merge-base.c
  51. builtin-merge-file.c
  52. builtin-mv.c
  53. builtin-name-rev.c
  54. builtin-pack-objects.c
  55. builtin-pack-refs.c
  56. builtin-prune-packed.c
  57. builtin-prune.c
  58. builtin-push.c
  59. builtin-read-tree.c
  60. builtin-reflog.c
  61. builtin-rerere.c
  62. builtin-rev-list.c
  63. builtin-rev-parse.c
  64. builtin-rm.c
  65. builtin-runstatus.c
  66. builtin-shortlog.c
  67. builtin-show-branch.c
  68. builtin-show-ref.c
  69. builtin-stripspace.c
  70. builtin-symbolic-ref.c
  71. builtin-tar-tree.c
  72. builtin-unpack-objects.c
  73. builtin-update-index.c
  74. builtin-update-ref.c
  75. builtin-upload-archive.c
  76. builtin-verify-pack.c
  77. builtin-write-tree.c
  78. builtin.h
  79. cache-tree.c
  80. cache-tree.h
  81. cache.h
  82. check-builtins.sh
  83. check-racy.c
  84. color.c
  85. color.h
  86. combine-diff.c
  87. commit.c
  88. commit.h
  89. config.c
  90. config.mak.in
  91. configure.ac
  92. connect.c
  93. convert-objects.c
  94. convert.c
  95. copy.c
  96. COPYING
  97. csum-file.c
  98. csum-file.h
  99. ctype.c
  100. daemon.c
  101. date.c
  102. delta.h
  103. diff-delta.c
  104. diff-lib.c
  105. diff.c
  106. diff.h
  107. diffcore-break.c
  108. diffcore-delta.c
  109. diffcore-order.c
  110. diffcore-pickaxe.c
  111. diffcore-rename.c
  112. diffcore.h
  113. dir.c
  114. dir.h
  115. dump-cache-tree.c
  116. entry.c
  117. environment.c
  118. exec_cmd.c
  119. exec_cmd.h
  120. fast-import.c
  121. fetch-pack.c
  122. fetch.c
  123. fetch.h
  124. generate-cmdlist.sh
  125. git-add--interactive.perl
  126. git-am.sh
  127. git-applymbox.sh
  128. git-applypatch.sh
  129. git-archimport.perl
  130. git-bisect.sh
  131. git-checkout.sh
  132. git-clean.sh
  133. git-clone.sh
  134. git-commit.sh
  135. git-compat-util.h
  136. git-cvsexportcommit.perl
  137. git-cvsimport.perl
  138. git-cvsserver.perl
  139. git-fetch.sh
  140. git-gc.sh
  141. git-instaweb.sh
  142. git-lost-found.sh
  143. git-ls-remote.sh
  144. git-merge-octopus.sh
  145. git-merge-one-file.sh
  146. git-merge-ours.sh
  147. git-merge-resolve.sh
  148. git-merge-stupid.sh
  149. git-merge.sh
  150. git-p4import.py
  151. git-parse-remote.sh
  152. git-pull.sh
  153. git-quiltimport.sh
  154. git-rebase.sh
  155. git-relink.perl
  156. git-remote.perl
  157. git-repack.sh
  158. git-request-pull.sh
  159. git-reset.sh
  160. git-revert.sh
  161. git-send-email.perl
  162. git-sh-setup.sh
  163. git-svn.perl
  164. git-svnimport.perl
  165. git-tag.sh
  166. git-verify-tag.sh
  167. GIT-VERSION-GEN
  168. git.c
  169. git.spec.in
  170. gitk
  171. grep.c
  172. grep.h
  173. hash-object.c
  174. help.c
  175. http-fetch.c
  176. http-push.c
  177. http.c
  178. http.h
  179. ident.c
  180. imap-send.c
  181. index-pack.c
  182. INSTALL
  183. interpolate.c
  184. interpolate.h
  185. list-objects.c
  186. list-objects.h
  187. local-fetch.c
  188. lockfile.c
  189. log-tree.c
  190. log-tree.h
  191. Makefile
  192. merge-file.c
  193. merge-index.c
  194. merge-recursive.c
  195. merge-tree.c
  196. mktag.c
  197. mktree.c
  198. object-refs.c
  199. object.c
  200. object.h
  201. pack-check.c
  202. pack-redundant.c
  203. pack.h
  204. pager.c
  205. patch-delta.c
  206. patch-id.c
  207. path-list.c
  208. path-list.h
  209. path.c
  210. peek-remote.c
  211. pkt-line.c
  212. pkt-line.h
  213. quote.c
  214. quote.h
  215. reachable.c
  216. reachable.h
  217. read-cache.c
  218. README
  219. receive-pack.c
  220. reflog-walk.c
  221. reflog-walk.h
  222. refs.c
  223. refs.h
  224. revision.c
  225. revision.h
  226. rsh.c
  227. rsh.h
  228. run-command.c
  229. run-command.h
  230. send-pack.c
  231. server-info.c
  232. setup.c
  233. sha1_file.c
  234. sha1_name.c
  235. shallow.c
  236. shell.c
  237. show-index.c
  238. sideband.c
  239. sideband.h
  240. ssh-fetch.c
  241. ssh-pull.c
  242. ssh-push.c
  243. ssh-upload.c
  244. strbuf.c
  245. strbuf.h
  246. tag.c
  247. tag.h
  248. tar.h
  249. test-date.c
  250. test-delta.c
  251. test-sha1.c
  252. test-sha1.sh
  253. trace.c
  254. tree-diff.c
  255. tree-walk.c
  256. tree-walk.h
  257. tree.c
  258. tree.h
  259. unpack-file.c
  260. unpack-trees.c
  261. unpack-trees.h
  262. update-server-info.c
  263. upload-pack.c
  264. usage.c
  265. utf8.c
  266. utf8.h
  267. var.c
  268. write_or_die.c
  269. wt-status.c
  270. wt-status.h
  271. xdiff-interface.c
  272. xdiff-interface.h