Google Git
Sign in
googlers / jrn / git / 5948e2ae27d936f7737f4d7433ca6c0b879fe4c8
commit5948e2ae27d936f7737f4d7433ca6c0b879fe4c8[log] [tgz]
authorMiklos Vajna <vmiklos@frugalware.org>Fri Jun 27 19:06:26 2008 +0200
committerJunio C Hamano <gitster@pobox.com>Mon Jun 30 22:45:51 2008 -0700
tree7fd2857a31fb6c6fbcda2a4951d8bfd932e6f6bd
parent5240c9d75d8e1b747da427ba6320432d3201168a [diff]
Add new test to ensure git-merge handles more than 25 refs.

The old shell version handled only 25 refs but we no longer have this
limitation. Add a test to make sure this limitation will not be
introduced again in the future.

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