Google Git
Sign in
googlers / jrn / git / 15ba3af2d5056313fa19ceb0cb7f7cb3cdd54f16
commit15ba3af2d5056313fa19ceb0cb7f7cb3cdd54f16[log] [tgz]
authorJunio C Hamano <junkio@cox.net>Wed Apr 18 19:05:57 2007 -0700
committerJunio C Hamano <junkio@cox.net>Wed Apr 18 19:21:52 2007 -0700
treed00bc5700c9feaedaa59a95b70d05f9999cceb00
parenta5e92abde61d59a8612c5b87d0bae681e90f7fdb [diff]
Counto-fix in merge-recursive

When the configuration has variables unrelated to low-level
merge drivers (e.g. merge.summary), the code failed to ignore
them but did something totally senseless.

Signed-off-by: Junio C Hamano <junkio@cox.net>
1 file changed
tree: d00bc5700c9feaedaa59a95b70d05f9999cceb00
  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.2.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. delta.h
  110. diff-delta.c
  111. diff-lib.c
  112. diff.c
  113. diff.h
  114. diffcore-break.c
  115. diffcore-delta.c
  116. diffcore-order.c
  117. diffcore-pickaxe.c
  118. diffcore-rename.c
  119. diffcore.h
  120. dir.c
  121. dir.h
  122. dump-cache-tree.c
  123. entry.c
  124. environment.c
  125. exec_cmd.c
  126. exec_cmd.h
  127. fast-import.c
  128. fetch-pack.c
  129. fetch.c
  130. fetch.h
  131. generate-cmdlist.sh
  132. git-add--interactive.perl
  133. git-am.sh
  134. git-applymbox.sh
  135. git-applypatch.sh
  136. git-archimport.perl
  137. git-bisect.sh
  138. git-checkout.sh
  139. git-clean.sh
  140. git-clone.sh
  141. git-commit.sh
  142. git-compat-util.h
  143. git-cvsexportcommit.perl
  144. git-cvsimport.perl
  145. git-cvsserver.perl
  146. git-fetch.sh
  147. git-instaweb.sh
  148. git-lost-found.sh
  149. git-ls-remote.sh
  150. git-merge-octopus.sh
  151. git-merge-one-file.sh
  152. git-merge-ours.sh
  153. git-merge-resolve.sh
  154. git-merge-stupid.sh
  155. git-merge.sh
  156. git-mergetool.sh
  157. git-p4import.py
  158. git-parse-remote.sh
  159. git-pull.sh
  160. git-quiltimport.sh
  161. git-rebase.sh
  162. git-relink.perl
  163. git-remote.perl
  164. git-repack.sh
  165. git-request-pull.sh
  166. git-reset.sh
  167. git-send-email.perl
  168. git-sh-setup.sh
  169. git-svn.perl
  170. git-svnimport.perl
  171. git-tag.sh
  172. git-verify-tag.sh
  173. GIT-VERSION-GEN
  174. git.c
  175. git.spec.in
  176. gitk
  177. grep.c
  178. grep.h
  179. hash-object.c
  180. help.c
  181. http-fetch.c
  182. http-push.c
  183. http.c
  184. http.h
  185. ident.c
  186. imap-send.c
  187. index-pack.c
  188. INSTALL
  189. interpolate.c
  190. interpolate.h
  191. list-objects.c
  192. list-objects.h
  193. local-fetch.c
  194. lockfile.c
  195. log-tree.c
  196. log-tree.h
  197. Makefile
  198. match-trees.c
  199. merge-file.c
  200. merge-index.c
  201. merge-recursive.c
  202. merge-tree.c
  203. mktag.c
  204. mktree.c
  205. object-refs.c
  206. object.c
  207. object.h
  208. pack-check.c
  209. pack-redundant.c
  210. pack.h
  211. pager.c
  212. patch-delta.c
  213. patch-id.c
  214. patch-ids.c
  215. patch-ids.h
  216. path-list.c
  217. path-list.h
  218. path.c
  219. peek-remote.c
  220. pkt-line.c
  221. pkt-line.h
  222. quote.c
  223. quote.h
  224. reachable.c
  225. reachable.h
  226. read-cache.c
  227. README
  228. receive-pack.c
  229. reflog-walk.c
  230. reflog-walk.h
  231. refs.c
  232. refs.h
  233. revision.c
  234. revision.h
  235. rsh.c
  236. rsh.h
  237. run-command.c
  238. run-command.h
  239. send-pack.c
  240. server-info.c
  241. setup.c
  242. sha1_file.c
  243. sha1_name.c
  244. shallow.c
  245. shell.c
  246. show-index.c
  247. sideband.c
  248. sideband.h
  249. ssh-fetch.c
  250. ssh-pull.c
  251. ssh-push.c
  252. ssh-upload.c
  253. strbuf.c
  254. strbuf.h
  255. tag.c
  256. tag.h
  257. tar.h
  258. test-chmtime.c
  259. test-date.c
  260. test-delta.c
  261. test-match-trees.c
  262. test-sha1.c
  263. test-sha1.sh
  264. trace.c
  265. tree-diff.c
  266. tree-walk.c
  267. tree-walk.h
  268. tree.c
  269. tree.h
  270. unpack-file.c
  271. unpack-trees.c
  272. unpack-trees.h
  273. update-server-info.c
  274. upload-pack.c
  275. usage.c
  276. utf8.c
  277. utf8.h
  278. var.c
  279. write_or_die.c
  280. wt-status.c
  281. wt-status.h
  282. xdiff-interface.c
  283. xdiff-interface.h