Google Git
Sign in
googlers / jrn / git / 419e38337a4ff66ae2968756cc46c1bf77074814
commit419e38337a4ff66ae2968756cc46c1bf77074814[log] [tgz]
authorMiklos Vajna <vmiklos@frugalware.org>Thu Feb 28 13:36:54 2008 +0100
committerJunio C Hamano <gitster@pobox.com>Fri Feb 29 00:00:29 2008 -0800
tree253cb6290ab2f747dc96763752096f3b8cf15a65
parent39fe578bdcc318308bc5d75efa04bd4bfc3a4f23 [diff]
Improve t6029 to check the real "subtree" case

t6029 already checks if subtree available and works like recursive. This
patch adds code to test test the extra functionality the subtree merge
strategy provides.

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