Google Git
Sign in
code / git / 69e82602b9a5a01bc225d9b4e7a65a9daba506cb
commit69e82602b9a5a01bc225d9b4e7a65a9daba506cb[log] [tgz]
authorJunio C Hamano <gitster@pobox.com>Fri May 25 11:26:38 2012 -0700
committerJunio C Hamano <gitster@pobox.com>Fri May 25 11:26:38 2012 -0700
treea1fbafe5fb22f2d96e782a0833b9c2b70c4aea31
parent98eb3fc6cbdede41809e29166ddad4edf6acd1f4 [diff]
parent5e73633dbf8a62190611f6eb438a1a2eaaffa919 [diff]
Merge branch 'hv/submodule-alt-odb' into maint

When a submodule repository uses alternate object store mechanism, some
commands that were started from the superproject did not notice it and
failed with "No such object" errors.  The subcommands of "git submodule"
command that recursed into the submodule in a separate process were OK;
only the ones that cheated and peeked directly into the submodule's
repository from the primary process were affected.

By Heiko Voigt
* hv/submodule-alt-odb:
  teach add_submodule_odb() to look for alternates
tree: a1fbafe5fb22f2d96e782a0833b9c2b70c4aea31
  1. block-sha1/
  2. builtin/
  3. compat/
  4. contrib/
  5. Documentation/
  6. git-gui/
  7. git_remote_helpers/
  8. gitk-git/
  9. gitweb/
  10. mergetools/
  11. perl/
  12. po/
  13. ppc/
  14. t/
  15. templates/
  16. vcs-svn/
  17. xdiff/
  18. RelNotes ⇨ Documentation/RelNotes/1.7.10.3.txt
  19. .gitattributes
  20. .gitignore
  21. .mailmap
  22. abspath.c
  23. aclocal.m4
  24. advice.c
  25. advice.h
  26. alias.c
  27. alloc.c
  28. archive-tar.c
  29. archive-zip.c
  30. archive.c
  31. archive.h
  32. argv-array.c
  33. argv-array.h
  34. attr.c
  35. attr.h
  36. base85.c
  37. bisect.c
  38. bisect.h
  39. blob.c
  40. blob.h
  41. branch.c
  42. branch.h
  43. builtin.h
  44. bulk-checkin.c
  45. bulk-checkin.h
  46. bundle.c
  47. bundle.h
  48. cache-tree.c
  49. cache-tree.h
  50. cache.h
  51. check-builtins.sh
  52. check-racy.c
  53. check_bindir
  54. color.c
  55. color.h
  56. combine-diff.c
  57. command-list.txt
  58. commit.c
  59. commit.h
  60. config.c
  61. config.mak.in
  62. configure.ac
  63. connect.c
  64. connected.c
  65. connected.h
  66. convert.c
  67. convert.h
  68. copy.c
  69. COPYING
  70. credential-cache--daemon.c
  71. credential-cache.c
  72. credential-store.c
  73. credential.c
  74. credential.h
  75. csum-file.c
  76. csum-file.h
  77. ctype.c
  78. daemon.c
  79. date.c
  80. decorate.c
  81. decorate.h
  82. delta.h
  83. diff-delta.c
  84. diff-lib.c
  85. diff-no-index.c
  86. diff.c
  87. diff.h
  88. diffcore-break.c
  89. diffcore-delta.c
  90. diffcore-order.c
  91. diffcore-pickaxe.c
  92. diffcore-rename.c
  93. diffcore.h
  94. dir.c
  95. dir.h
  96. editor.c
  97. entry.c
  98. environment.c
  99. exec_cmd.c
  100. exec_cmd.h
  101. fast-import.c
  102. fetch-pack.h
  103. fixup-builtins
  104. fmt-merge-msg.h
  105. fsck.c
  106. fsck.h
  107. generate-cmdlist.sh
  108. gettext.c
  109. gettext.h
  110. git-add--interactive.perl
  111. git-am.sh
  112. git-archimport.perl
  113. git-bisect.sh
  114. git-compat-util.h
  115. git-cvsexportcommit.perl
  116. git-cvsimport.perl
  117. git-cvsserver.perl
  118. git-difftool--helper.sh
  119. git-difftool.perl
  120. git-filter-branch.sh
  121. git-instaweb.sh
  122. git-lost-found.sh
  123. git-merge-octopus.sh
  124. git-merge-one-file.sh
  125. git-merge-resolve.sh
  126. git-mergetool--lib.sh
  127. git-mergetool.sh
  128. git-parse-remote.sh
  129. git-pull.sh
  130. git-quiltimport.sh
  131. git-rebase--am.sh
  132. git-rebase--interactive.sh
  133. git-rebase--merge.sh
  134. git-rebase.sh
  135. git-relink.perl
  136. git-remote-testgit.py
  137. git-repack.sh
  138. git-request-pull.sh
  139. git-send-email.perl
  140. git-sh-i18n.sh
  141. git-sh-setup.sh
  142. git-stash.sh
  143. git-submodule.sh
  144. git-svn.perl
  145. GIT-VERSION-GEN
  146. git-web--browse.sh
  147. git.c
  148. git.spec.in
  149. gpg-interface.c
  150. gpg-interface.h
  151. graph.c
  152. graph.h
  153. grep.c
  154. grep.h
  155. hash.c
  156. hash.h
  157. help.c
  158. help.h
  159. hex.c
  160. http-backend.c
  161. http-fetch.c
  162. http-push.c
  163. http-walker.c
  164. http.c
  165. http.h
  166. ident.c
  167. imap-send.c
  168. INSTALL
  169. kwset.c
  170. kwset.h
  171. levenshtein.c
  172. levenshtein.h
  173. LGPL-2.1
  174. list-objects.c
  175. list-objects.h
  176. ll-merge.c
  177. ll-merge.h
  178. lockfile.c
  179. log-tree.c
  180. log-tree.h
  181. mailmap.c
  182. mailmap.h
  183. Makefile
  184. match-trees.c
  185. merge-file.c
  186. merge-file.h
  187. merge-recursive.c
  188. merge-recursive.h
  189. name-hash.c
  190. notes-cache.c
  191. notes-cache.h
  192. notes-merge.c
  193. notes-merge.h
  194. notes.c
  195. notes.h
  196. object.c
  197. object.h
  198. pack-check.c
  199. pack-refs.c
  200. pack-refs.h
  201. pack-revindex.c
  202. pack-revindex.h
  203. pack-write.c
  204. pack.h
  205. pager.c
  206. parse-options-cb.c
  207. parse-options.c
  208. parse-options.h
  209. patch-delta.c
  210. patch-ids.c
  211. patch-ids.h
  212. path.c
  213. pkt-line.c
  214. pkt-line.h
  215. preload-index.c
  216. pretty.c
  217. progress.c
  218. progress.h
  219. prompt.c
  220. prompt.h
  221. quote.c
  222. quote.h
  223. reachable.c
  224. reachable.h
  225. read-cache.c
  226. README
  227. reflog-walk.c
  228. reflog-walk.h
  229. refs.c
  230. refs.h
  231. remote-curl.c
  232. remote.c
  233. remote.h
  234. replace_object.c
  235. rerere.c
  236. rerere.h
  237. resolve-undo.c
  238. resolve-undo.h
  239. revision.c
  240. revision.h
  241. run-command.c
  242. run-command.h
  243. send-pack.h
  244. sequencer.c
  245. sequencer.h
  246. server-info.c
  247. setup.c
  248. sh-i18n--envsubst.c
  249. sha1-array.c
  250. sha1-array.h
  251. sha1-lookup.c
  252. sha1-lookup.h
  253. sha1_file.c
  254. sha1_name.c
  255. shallow.c
  256. shell.c
  257. shortlog.h
  258. show-index.c
  259. sideband.c
  260. sideband.h
  261. sigchain.c
  262. sigchain.h
  263. strbuf.c
  264. strbuf.h
  265. streaming.c
  266. streaming.h
  267. string-list.c
  268. string-list.h
  269. submodule.c
  270. submodule.h
  271. symlinks.c
  272. tag.c
  273. tag.h
  274. tar.h
  275. test-chmtime.c
  276. test-credential.c
  277. test-ctype.c
  278. test-date.c
  279. test-delta.c
  280. test-dump-cache-tree.c
  281. test-genrandom.c
  282. test-index-version.c
  283. test-line-buffer.c
  284. test-match-trees.c
  285. test-mktemp.c
  286. test-parse-options.c
  287. test-path-utils.c
  288. test-run-command.c
  289. test-scrap-cache-tree.c
  290. test-sha1.c
  291. test-sha1.sh
  292. test-sigchain.c
  293. test-subprocess.c
  294. test-svn-fe.c
  295. thread-utils.c
  296. thread-utils.h
  297. trace.c
  298. transport-helper.c
  299. transport.c
  300. transport.h
  301. tree-diff.c
  302. tree-walk.c
  303. tree-walk.h
  304. tree.c
  305. tree.h
  306. unimplemented.sh
  307. unix-socket.c
  308. unix-socket.h
  309. unpack-trees.c
  310. unpack-trees.h
  311. upload-pack.c
  312. url.c
  313. url.h
  314. usage.c
  315. userdiff.c
  316. userdiff.h
  317. utf8.c
  318. utf8.h
  319. walker.c
  320. walker.h
  321. wrap-for-bin.sh
  322. wrapper.c
  323. write_or_die.c
  324. ws.c
  325. wt-status.c
  326. wt-status.h
  327. xdiff-interface.c
  328. xdiff-interface.h
  329. zlib.c