Google Git
Sign in
googlers / jrn / git / 86506fe54c8e9e5f75a73956840497e3e5744f86
commit86506fe54c8e9e5f75a73956840497e3e5744f86[log] [tgz]
authorSimon Hausmann <simon@lst.de>Wed Jul 18 12:40:12 2007 +0200
committerSimon Hausmann <simon@lst.de>Wed Jul 18 17:29:31 2007 +0200
tree1f5429d94161bb3b368f21282e78e578784cc6b8
parent062410bb9d6553e6bc4f8fa7f0cab1ed63b75628 [diff]
git-p4: Fix upstream branch detection for submit/rebase with multiple branches.

Don't use git name-rev to locate the upstream git-p4 branch for rebase and submit but instead locate the branch by comparing the depot paths.
name-rev may produce results like wrongbranch~12 as it uses the first match.

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