Google Git
Sign in
code / git / d9cb5399ee6e3ca4b3190f158ada7bd3802b3c70
commitd9cb5399ee6e3ca4b3190f158ada7bd3802b3c70[log] [tgz]
authorPaolo Bonzini <paolo.bonzini@lu.unisi.ch>Wed Mar 07 10:43:41 2007 +0100
committerJunio C Hamano <junkio@cox.net>Wed Mar 07 10:30:22 2007 -0800
tree56b1ff2a0a4aff08fac8be9f6ea8f2da794deb49
parente3d842cf12f6ef6d155ef578957cf98d93abe09a [diff]
git-archimport: allow remapping branch names

This patch adds support to archimport for remapping the branch
names to match those used in git more closely.  This is useful
for projects that migrate to git (as opposed to users that want
to use git on Arch-based projects).  For example, one can choose
an Arch branch name and call it "master".

The new command-line syntax works even if there is a colon in
a branch name, since only the part after the last colon is taken
to be the git name (git does not allow colons in branch names).

The new feature is implemented so that archives rotated every
year can also be remapped into a single git archive.

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