prepare_commit_graft: treat non-repository as a noop

The parse_commit_buffer() function consults lookup_commit_graft()
to see if we need to rewrite parents. The latter will look
at $GIT_DIR/info/grafts. If you're outside of a repository,
then this will trigger a BUG() as of b1ef400eec (setup_git_env:
avoid blind fall-back to ".git", 2016-10-20).

It's probably uncommon to actually parse a commit outside of
a repository, but you can see it in action with:

  cd /not/a/git/repo
  git index-pack --strict /some/file.pack

This works fine without --strict, but the fsck checks will
try to parse any commits, triggering the BUG(). We can fix
that by teaching the graft code to behave as if there are no
grafts when we aren't in a repository.

Arguably index-pack (and fsck) are wrong to consider grafts
at all. So another solution is to disable grafts entirely
for those commands. But given that the graft feature is
deprecated anyway, it's not worth even thinking through the
ramifications that might have.

There is one other corner case I considered here. What
should:

  cd /not/a/git/repo
  export GIT_GRAFT_FILE=/file/with/grafts
  git index-pack --strict /some/file.pack

do? We don't have a repository, but the user has pointed us
directly at a graft file, which we could respect. I believe
this case did work that way prior to b1ef400eec. However,
fixing it now would be pretty invasive. Back then we would
just call into setup_git_env() even without a repository.
But these days it actually takes a git_dir argument. So
there would be a fair bit of refactoring of the setup code
involved.

Given the obscurity of this case, plus the fact that grafts
are deprecated and probably shouldn't work under index-pack
anyway, it's not worth pursuing further. This patch at least
un-breaks the common case where you're _not_ using grafts,
but we BUG() anyway trying to even find that out.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2 files changed
tree: 2ef15386854e782b2dc7e18904054fdd740af601
  1. .github/
  2. block-sha1/
  3. builtin/
  4. ci/
  5. compat/
  6. contrib/
  7. Documentation/
  8. ewah/
  9. git-gui/
  10. gitk-git/
  11. gitweb/
  12. mergetools/
  13. perl/
  14. po/
  15. ppc/
  16. refs/
  17. sha1dc/
  18. t/
  19. templates/
  20. vcs-svn/
  21. xdiff/
  22. .clang-format
  23. .gitattributes
  24. .gitignore
  25. .gitmodules
  26. .mailmap
  27. .travis.yml
  28. .tsan-suppressions
  29. abspath.c
  30. aclocal.m4
  31. advice.c
  32. advice.h
  33. alias.c
  34. alloc.c
  35. apply.c
  36. apply.h
  37. archive-tar.c
  38. archive-zip.c
  39. archive.c
  40. archive.h
  41. argv-array.c
  42. argv-array.h
  43. attr.c
  44. attr.h
  45. base85.c
  46. bisect.c
  47. bisect.h
  48. blame.c
  49. blame.h
  50. blob.c
  51. blob.h
  52. branch.c
  53. branch.h
  54. builtin.h
  55. bulk-checkin.c
  56. bulk-checkin.h
  57. bundle.c
  58. bundle.h
  59. cache-tree.c
  60. cache-tree.h
  61. cache.h
  62. check-builtins.sh
  63. check-racy.c
  64. check_bindir
  65. checkout.c
  66. checkout.h
  67. color.c
  68. color.h
  69. column.c
  70. column.h
  71. combine-diff.c
  72. command-list.txt
  73. commit-slab.h
  74. commit.c
  75. commit.h
  76. common-main.c
  77. config.c
  78. config.h
  79. config.mak.in
  80. config.mak.uname
  81. configure.ac
  82. connect.c
  83. connect.h
  84. connected.c
  85. connected.h
  86. convert.c
  87. convert.h
  88. copy.c
  89. COPYING
  90. credential-cache--daemon.c
  91. credential-cache.c
  92. credential-store.c
  93. credential.c
  94. credential.h
  95. csum-file.c
  96. csum-file.h
  97. ctype.c
  98. daemon.c
  99. date.c
  100. decorate.c
  101. decorate.h
  102. delta.h
  103. diff-delta.c
  104. diff-lib.c
  105. diff-no-index.c
  106. diff.c
  107. diff.h
  108. diffcore-break.c
  109. diffcore-delta.c
  110. diffcore-order.c
  111. diffcore-pickaxe.c
  112. diffcore-rename.c
  113. diffcore.h
  114. dir-iterator.c
  115. dir-iterator.h
  116. dir.c
  117. dir.h
  118. editor.c
  119. entry.c
  120. environment.c
  121. exec_cmd.c
  122. exec_cmd.h
  123. fast-import.c
  124. fetch-object.c
  125. fetch-object.h
  126. fetch-pack.c
  127. fetch-pack.h
  128. fmt-merge-msg.h
  129. fsck.c
  130. fsck.h
  131. fsmonitor.c
  132. fsmonitor.h
  133. generate-cmdlist.sh
  134. gettext.c
  135. gettext.h
  136. git-add--interactive.perl
  137. git-archimport.perl
  138. git-bisect.sh
  139. git-compat-util.h
  140. git-cvsexportcommit.perl
  141. git-cvsimport.perl
  142. git-cvsserver.perl
  143. git-difftool--helper.sh
  144. git-filter-branch.sh
  145. git-instaweb.sh
  146. git-merge-octopus.sh
  147. git-merge-one-file.sh
  148. git-merge-resolve.sh
  149. git-mergetool--lib.sh
  150. git-mergetool.sh
  151. git-p4.py
  152. git-parse-remote.sh
  153. git-quiltimport.sh
  154. git-rebase--am.sh
  155. git-rebase--interactive.sh
  156. git-rebase--merge.sh
  157. git-rebase.sh
  158. git-remote-testgit.sh
  159. git-request-pull.sh
  160. git-send-email.perl
  161. git-sh-i18n.sh
  162. git-sh-setup.sh
  163. git-stash.sh
  164. git-submodule.sh
  165. git-svn.perl
  166. GIT-VERSION-GEN
  167. git-web--browse.sh
  168. git.c
  169. git.rc
  170. gpg-interface.c
  171. gpg-interface.h
  172. graph.c
  173. graph.h
  174. grep.c
  175. grep.h
  176. hash.h
  177. hashmap.c
  178. hashmap.h
  179. help.c
  180. help.h
  181. hex.c
  182. http-backend.c
  183. http-fetch.c
  184. http-push.c
  185. http-walker.c
  186. http.c
  187. http.h
  188. ident.c
  189. imap-send.c
  190. INSTALL
  191. iterator.h
  192. khash.h
  193. kwset.c
  194. kwset.h
  195. levenshtein.c
  196. levenshtein.h
  197. LGPL-2.1
  198. line-log.c
  199. line-log.h
  200. line-range.c
  201. line-range.h
  202. list-objects-filter-options.c
  203. list-objects-filter-options.h
  204. list-objects-filter.c
  205. list-objects-filter.h
  206. list-objects.c
  207. list-objects.h
  208. list.h
  209. ll-merge.c
  210. ll-merge.h
  211. lockfile.c
  212. lockfile.h
  213. log-tree.c
  214. log-tree.h
  215. mailinfo.c
  216. mailinfo.h
  217. mailmap.c
  218. mailmap.h
  219. Makefile
  220. match-trees.c
  221. merge-blobs.c
  222. merge-blobs.h
  223. merge-recursive.c
  224. merge-recursive.h
  225. merge.c
  226. mergesort.c
  227. mergesort.h
  228. name-hash.c
  229. notes-cache.c
  230. notes-cache.h
  231. notes-merge.c
  232. notes-merge.h
  233. notes-utils.c
  234. notes-utils.h
  235. notes.c
  236. notes.h
  237. object.c
  238. object.h
  239. oidmap.c
  240. oidmap.h
  241. oidset.c
  242. oidset.h
  243. pack-bitmap-write.c
  244. pack-bitmap.c
  245. pack-bitmap.h
  246. pack-check.c
  247. pack-objects.c
  248. pack-objects.h
  249. pack-revindex.c
  250. pack-revindex.h
  251. pack-write.c
  252. pack.h
  253. packfile.c
  254. packfile.h
  255. pager.c
  256. parse-options-cb.c
  257. parse-options.c
  258. parse-options.h
  259. patch-delta.c
  260. patch-ids.c
  261. patch-ids.h
  262. path.c
  263. path.h
  264. pathspec.c
  265. pathspec.h
  266. pkt-line.c
  267. pkt-line.h
  268. preload-index.c
  269. pretty.c
  270. pretty.h
  271. prio-queue.c
  272. prio-queue.h
  273. progress.c
  274. progress.h
  275. prompt.c
  276. prompt.h
  277. protocol.c
  278. protocol.h
  279. quote.c
  280. quote.h
  281. reachable.c
  282. reachable.h
  283. read-cache.c
  284. README.md
  285. ref-filter.c
  286. ref-filter.h
  287. reflog-walk.c
  288. reflog-walk.h
  289. refs.c
  290. refs.h
  291. remote-curl.c
  292. remote-testsvn.c
  293. remote.c
  294. remote.h
  295. replace_object.c
  296. repository.c
  297. repository.h
  298. rerere.c
  299. rerere.h
  300. resolve-undo.c
  301. resolve-undo.h
  302. revision.c
  303. revision.h
  304. run-command.c
  305. run-command.h
  306. send-pack.c
  307. send-pack.h
  308. sequencer.c
  309. sequencer.h
  310. server-info.c
  311. setup.c
  312. sh-i18n--envsubst.c
  313. sha1-array.c
  314. sha1-array.h
  315. sha1-lookup.c
  316. sha1-lookup.h
  317. sha1_file.c
  318. sha1_name.c
  319. sha1dc_git.c
  320. sha1dc_git.h
  321. shallow.c
  322. shell.c
  323. shortlog.h
  324. show-index.c
  325. sideband.c
  326. sideband.h
  327. sigchain.c
  328. sigchain.h
  329. split-index.c
  330. split-index.h
  331. strbuf.c
  332. strbuf.h
  333. streaming.c
  334. streaming.h
  335. string-list.c
  336. string-list.h
  337. sub-process.c
  338. sub-process.h
  339. submodule-config.c
  340. submodule-config.h
  341. submodule.c
  342. submodule.h
  343. symlinks.c
  344. tag.c
  345. tag.h
  346. tar.h
  347. tempfile.c
  348. tempfile.h
  349. thread-utils.c
  350. thread-utils.h
  351. tmp-objdir.c
  352. tmp-objdir.h
  353. trace.c
  354. trace.h
  355. trailer.c
  356. trailer.h
  357. transport-helper.c
  358. transport-internal.h
  359. transport.c
  360. transport.h
  361. tree-diff.c
  362. tree-walk.c
  363. tree-walk.h
  364. tree.c
  365. tree.h
  366. unicode_width.h
  367. unimplemented.sh
  368. unix-socket.c
  369. unix-socket.h
  370. unpack-trees.c
  371. unpack-trees.h
  372. upload-pack.c
  373. url.c
  374. url.h
  375. urlmatch.c
  376. urlmatch.h
  377. usage.c
  378. userdiff.c
  379. userdiff.h
  380. utf8.c
  381. utf8.h
  382. varint.c
  383. varint.h
  384. version.c
  385. version.h
  386. versioncmp.c
  387. walker.c
  388. walker.h
  389. wildmatch.c
  390. wildmatch.h
  391. worktree.c
  392. worktree.h
  393. wrap-for-bin.sh
  394. wrapper.c
  395. write_or_die.c
  396. ws.c
  397. wt-status.c
  398. wt-status.h
  399. xdiff-interface.c
  400. xdiff-interface.h
  401. zlib.c
README.md

Git - fast, scalable, distributed revision control system

Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals.

Git is an Open Source project covered by the GNU General Public License version 2 (some parts of it are under different licenses, compatible with the GPLv2). It was originally written by Linus Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

Many Git online resources are accessible from https://git-scm.com/ including full documentation and Git related tools.

See Documentation/gittutorial.txt to get started, then see Documentation/giteveryday.txt for a useful minimum set of commands, and Documentation/git-.txt for documentation of each command. If git has been correctly installed, then the tutorial can also be read with man gittutorial or git help tutorial, and the documentation of each command with man git-<commandname> or git help <commandname>.

CVS users may also want to read Documentation/gitcvs-migration.txt (man gitcvs-migration or git help cvs-migration if git is installed).

The user discussion and development of Git take place on the Git mailing list -- everyone is welcome to post bug reports, feature requests, comments and patches to git@vger.kernel.org (read Documentation/SubmittingPatches for instructions on patch submission). To subscribe to the list, send an email with just “subscribe git” in the body to majordomo@vger.kernel.org. The mailing list archives are available at https://public-inbox.org/git/, http://marc.info/?l=git and other archival sites.

The maintainer frequently sends the “What's cooking” reports that list the current status of various development topics to the mailing list. The discussion following them give a good reference for project status, development direction and remaining tasks.

The name “git” was given by Linus Torvalds when he wrote the very first version. He described the tool as “the stupid content tracker” and the name as (depending on your mood):

  • random three-letter combination that is pronounceable, and not actually used by any common UNIX command. The fact that it is a mispronunciation of “get” may or may not be relevant.
  • stupid. contemptible and despicable. simple. Take your pick from the dictionary of slang.
  • “global information tracker”: you're in a good mood, and it actually works for you. Angels sing, and a light suddenly fills the room.
  • “goddamn idiotic truckload of sh*t”: when it breaks