Google Git
Sign in
googlers / jrn / git / 023756f4eb71bfa37e17b0bdbf4b9fcbbba95466
commit023756f4eb71bfa37e17b0bdbf4b9fcbbba95466[log] [tgz]
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>Sat Sep 15 18:39:52 2007 +0100
committerJunio C Hamano <gitster@pobox.com>Sat Sep 15 16:34:11 2007 -0700
tree8e36fe2a13d5c5a1ea473eb274d834ffd50fe983
parente598c5177e439271e8bd81ef2a689a3ab0db80e6 [diff]
revision walker: --cherry-pick is a limited operation

We used to rely on the fact that cherry-pick would trigger the code path
to set limited = 1 in handle_commit(), when an uninteresting commit was
encountered.

However, when cherry picking between two independent branches, i.e. when
there are no merge bases, and there is only linear development (which can
happen when you cvsimport a fork of a project), no uninteresting commit
will be encountered.

So set limited = 1 when --cherry-pick was asked for.

Noticed by Martin Bähr.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2 files changed
tree: 8e36fe2a13d5c5a1ea473eb274d834ffd50fe983
  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.1.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-tag.c
  79. builtin-tar-tree.c
  80. builtin-unpack-objects.c
  81. builtin-update-index.c
  82. builtin-update-ref.c
  83. builtin-upload-archive.c
  84. builtin-verify-pack.c
  85. builtin-verify-tag.c
  86. builtin-write-tree.c
  87. builtin.h
  88. cache-tree.c
  89. cache-tree.h
  90. cache.h
  91. check-builtins.sh
  92. check-racy.c
  93. color.c
  94. color.h
  95. combine-diff.c
  96. commit.c
  97. commit.h
  98. config.c
  99. config.mak.in
  100. configure.ac
  101. connect.c
  102. convert-objects.c
  103. convert.c
  104. copy.c
  105. COPYING
  106. csum-file.c
  107. csum-file.h
  108. ctype.c
  109. daemon.c
  110. date.c
  111. decorate.c
  112. decorate.h
  113. delta.h
  114. diff-delta.c
  115. diff-lib.c
  116. diff.c
  117. diff.h
  118. diffcore-break.c
  119. diffcore-delta.c
  120. diffcore-order.c
  121. diffcore-pickaxe.c
  122. diffcore-rename.c
  123. diffcore.h
  124. dir.c
  125. dir.h
  126. dump-cache-tree.c
  127. entry.c
  128. environment.c
  129. exec_cmd.c
  130. exec_cmd.h
  131. fast-import.c
  132. fetch-pack.c
  133. fetch.c
  134. fetch.h
  135. fixup-builtins
  136. generate-cmdlist.sh
  137. git-add--interactive.perl
  138. git-am.sh
  139. git-archimport.perl
  140. git-bisect.sh
  141. git-checkout.sh
  142. git-clean.sh
  143. git-clone.sh
  144. git-commit.sh
  145. git-compat-util.h
  146. git-cvsexportcommit.perl
  147. git-cvsimport.perl
  148. git-cvsserver.perl
  149. git-fetch.sh
  150. git-filter-branch.sh
  151. git-instaweb.sh
  152. git-lost-found.sh
  153. git-ls-remote.sh
  154. git-merge-octopus.sh
  155. git-merge-one-file.sh
  156. git-merge-ours.sh
  157. git-merge-resolve.sh
  158. git-merge-stupid.sh
  159. git-merge.sh
  160. git-mergetool.sh
  161. git-parse-remote.sh
  162. git-pull.sh
  163. git-quiltimport.sh
  164. git-rebase--interactive.sh
  165. git-rebase.sh
  166. git-relink.perl
  167. git-remote.perl
  168. git-repack.sh
  169. git-request-pull.sh
  170. git-reset.sh
  171. git-send-email.perl
  172. git-sh-setup.sh
  173. git-stash.sh
  174. git-submodule.sh
  175. git-svn.perl
  176. git-svnimport.perl
  177. GIT-VERSION-GEN
  178. git.c
  179. git.spec.in
  180. gitk
  181. grep.c
  182. grep.h
  183. hash-object.c
  184. help.c
  185. http-fetch.c
  186. http-push.c
  187. http.c
  188. http.h
  189. ident.c
  190. imap-send.c
  191. index-pack.c
  192. INSTALL
  193. interpolate.c
  194. interpolate.h
  195. list-objects.c
  196. list-objects.h
  197. local-fetch.c
  198. lockfile.c
  199. log-tree.c
  200. log-tree.h
  201. mailmap.c
  202. mailmap.h
  203. Makefile
  204. match-trees.c
  205. merge-file.c
  206. merge-index.c
  207. merge-recursive.c
  208. merge-tree.c
  209. mktag.c
  210. mktree.c
  211. object-refs.c
  212. object.c
  213. object.h
  214. pack-check.c
  215. pack-redundant.c
  216. pack-write.c
  217. pack.h
  218. pager.c
  219. patch-delta.c
  220. patch-id.c
  221. patch-ids.c
  222. patch-ids.h
  223. path-list.c
  224. path-list.h
  225. path.c
  226. peek-remote.c
  227. pkt-line.c
  228. pkt-line.h
  229. progress.c
  230. progress.h
  231. quote.c
  232. quote.h
  233. reachable.c
  234. reachable.h
  235. read-cache.c
  236. README
  237. receive-pack.c
  238. reflog-walk.c
  239. reflog-walk.h
  240. refs.c
  241. refs.h
  242. remote.c
  243. remote.h
  244. revision.c
  245. revision.h
  246. rsh.c
  247. rsh.h
  248. run-command.c
  249. run-command.h
  250. send-pack.c
  251. server-info.c
  252. setup.c
  253. sha1_file.c
  254. sha1_name.c
  255. shallow.c
  256. shell.c
  257. show-index.c
  258. sideband.c
  259. sideband.h
  260. ssh-fetch.c
  261. ssh-pull.c
  262. ssh-push.c
  263. ssh-upload.c
  264. strbuf.c
  265. strbuf.h
  266. symlinks.c
  267. tag.c
  268. tag.h
  269. tar.h
  270. test-absolute-path.c
  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