1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-03 13:26:29 +02:00
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
Go to file
Brandon Williams 543107333b path: worktree_git_path() should not use file relocation
git_path is a convenience function that usually produces a string
$GIT_DIR/<path>.  Since v2.5.0-rc0~143^2~35 (git_path(): be aware of
file relocation in $GIT_DIR, 2014-11-30), as a side benefit callers
get support for path relocation variables like $GIT_OBJECT_DIRECTORY:

- git_path("index") is $GIT_INDEX_FILE when set
- git_path("info/grafts") is $GIT_GRAFTS_FILE when set
- git_path("objects/<foo>") is $GIT_OBJECT_DIRECTORY/<foo> when set
- git_path("hooks/<foo>") is <foo> under core.hookspath when set
- git_path("refs/<foo>") etc (see path.c::common_list) is relative
  to $GIT_COMMON_DIR instead of $GIT_DIR

worktree_git_path, by comparison, is designed to resolve files in a
specific worktree's git dir.  Unfortunately, it shares code with
git_path and performs the same relocation.  The result is that paths
that are meant to be relative to the specified worktree's git dir end
up replaced by paths from environment variables within the current git
dir.

Luckily, no current callers pass such arguments.  The relocation was
noticed when testing the result of merging two patches under review,
one of which introduces a caller:

* The first patch made git prune check the index file in each
  worktree's git dir (using worktree_git_path(wt, "index")) for
  objects not to prune.  This would trigger the unwanted relocation
  when GIT_INDEX_FILE is set, causing objects reachable from the
  index to be pruned.

* The second patch simplified the relocation logic for index,
  info/grafts, objects, and hooks to happen unconditionally instead of
  based on whether environment or configuration variables are set.
  This caused the relocation to trigger even when GIT_INDEX_FILE is
  not set.

[jn: rewrote commit message; skipping all relocation instead of just
 GIT_INDEX_FILE]

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-06-23 18:24:34 -07:00
Documentation Ninth batch for 2.14 2017-06-19 12:41:12 -07:00
block-sha1
builtin Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
ci Merge branch 'ls/travis-doc-asciidoctor' into maint 2017-06-05 09:03:10 +09:00
compat Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
contrib Merge branch 'rf/completion' 2017-06-13 13:47:09 -07:00
ewah Merge branch 'jk/ewah-use-right-type-in-sizeof' into maint 2017-03-21 15:03:24 -07:00
git-gui Fix build with core.autocrlf=true 2017-05-10 13:32:50 +09:00
gitk-git Merge git://ozlabs.org/~paulus/gitk 2017-01-18 10:27:59 -08:00
gitweb doc: use https links to Wikipedia to avoid http redirects 2017-05-15 13:04:54 +09:00
mergetools Merge branch 'da/mergetool-xxdiff-hotkey' into maint 2017-01-17 15:11:05 -08:00
perl Merge branch 'svn-escape-backslash' of git://bogomips.org/git-svn 2017-02-20 22:01:59 -08:00
po Merge branch 'master' of git://github.com/nafmo/git-l10n-sv 2017-05-09 22:12:34 +08:00
ppc
refs Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
sha1dc sha1dc: update from upstream 2017-06-07 09:25:20 +09:00
t Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
templates pre-receive.sample: mark it executable 2016-10-28 14:21:11 -07:00
vcs-svn timestamp_t: a new data type for timestamps 2017-04-27 13:07:39 +09:00
xdiff xdiff -W: relax end-of-file function detection 2017-01-15 16:08:11 -08:00
.gitattributes Fix build with core.autocrlf=true 2017-05-10 13:32:50 +09:00
.gitignore rebase--helper: add a builtin helper for interactive rebases 2017-02-09 14:55:26 -08:00
.mailmap Git 2.12.2 2017-03-24 13:31:01 -07:00
.travis.yml Merge branch 'ls/travis-doc-asciidoctor' into maint 2017-06-05 09:03:10 +09:00
COPYING
GIT-VERSION-GEN Git 2.13.1 2017-06-05 09:05:38 +09:00
INSTALL
LGPL-2.1
Makefile repository: introduce the repository object 2017-06-23 18:24:34 -07:00
README.md README: create HTTP/HTTPS links from URLs in Markdown 2017-03-01 14:45:45 -08:00
RelNotes Prepare for 2.13.2 2017-06-13 13:30:16 -07:00
abspath.c prefix_filename: simplify windows #ifdef 2017-03-21 11:18:41 -07:00
aclocal.m4
advice.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
advice.h
alias.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
alloc.c
apply.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
apply.h apply: learn to use a different index file 2016-09-07 12:29:54 -07:00
archive-tar.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
archive-zip.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
archive.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
archive.h timestamp_t: a new data type for timestamps 2017-04-27 13:07:39 +09:00
argv-array.c argv-array: add detach function 2016-02-22 14:50:32 -08:00
argv-array.h argv-array: add detach function 2016-02-22 14:50:32 -08:00
attr.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
attr.h pathspec: allow querying for attributes 2017-03-13 15:28:54 -07:00
base85.c
bisect.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
bisect.h
blame.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
blame.h blame: move entry prepend to libgit 2017-05-25 13:08:23 +09:00
blob.c Convert lookup_blob to struct object_id 2017-05-08 15:12:57 +09:00
blob.h Convert lookup_blob to struct object_id 2017-05-08 15:12:57 +09:00
branch.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
branch.h branch: record creation of renamed branch in HEAD's log 2017-02-20 22:04:47 -08:00
builtin.h blame: move textconv_object with related functions 2017-05-24 15:41:50 +09:00
bulk-checkin.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
bulk-checkin.h
bundle.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
bundle.h bundle: convert to struct object_id 2017-05-02 10:46:41 +09:00
cache-tree.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
cache-tree.h Convert struct cache_tree to use struct object_id 2017-05-02 10:46:41 +09:00
cache.h path: create path.h 2017-06-23 18:24:34 -07:00
check-builtins.sh
check-racy.c check-racy.c: use error_errno() 2016-05-09 12:29:08 -07:00
check_bindir
color.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
color.h Merge branch 'js/color-on-windows-comment' into maint 2016-07-28 11:25:55 -07:00
column.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
column.h
combine-diff.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
command-list.txt relink: retire the command 2017-01-25 14:42:37 -08:00
commit-slab.h Merge branch 'vs/typofix' 2016-08-12 09:47:37 -07:00
commit.c Merge branch 'nd/fopen-errors' 2017-06-13 13:47:09 -07:00
commit.h Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
common-main.c attr: use hashmap for attribute dictionary 2017-02-01 13:46:53 -08:00
config.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
config.h config: don't implicitly use gitdir or commondir 2017-06-15 12:56:22 -07:00
config.mak.in
config.mak.uname Merge branch 'ab/pcre-v2' 2017-06-19 12:38:43 -07:00
configure.ac grep: add support for PCRE v2 2017-06-02 08:29:05 +09:00
connect.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
connect.h connect & http: support -4 and -6 switches for remote operations 2016-02-12 11:34:14 -08:00
connected.c check_connected: accept an env argument 2016-10-10 13:54:02 -07:00
connected.h check_connected: accept an env argument 2016-10-10 13:54:02 -07:00
convert.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
convert.h convert: convert renormalize_buffer to take an index 2017-06-13 11:40:51 -07:00
copy.c copy.c: use error_errno() 2016-05-09 12:29:08 -07:00
credential-cache--daemon.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
credential-cache.c Merge branch 'nd/conditional-config-include' 2017-04-23 22:07:46 -07:00
credential-store.c path.c: and an option to call real_path() in expand_user_path() 2017-04-14 23:51:38 -07:00
credential.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
date.c date.c: abort if the system time cannot handle one of our timestamps 2017-04-27 13:07:40 +09:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c Merge branch 'bw/object-id' 2017-06-19 12:38:44 -07:00
diff-no-index.c diff: convert fill_filespec to struct object_id 2017-06-02 09:36:07 +09:00
diff.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
diff.h Merge branch 'bw/object-id' 2017-06-19 12:38:44 -07:00
diffcore-break.c Merge branch 'tk/diffcore-delta-remove-unused' into maint 2016-11-29 13:28:03 -08:00
diffcore-delta.c Merge branch 'tk/diffcore-delta-remove-unused' 2016-11-17 13:45:22 -08:00
diffcore-order.c use QSORT 2016-09-29 15:42:18 -07:00
diffcore-pickaxe.c Merge branch 'js/regexec-buf' into maint 2017-03-28 13:52:24 -07:00
diffcore-rename.c diffcore-rename: use is_empty_blob_oid 2017-06-05 11:23:58 +09:00
diffcore.h diff: convert fill_filespec to struct object_id 2017-06-02 09:36:07 +09:00
dir-iterator.c dir_iterator: new API for iterating over a directory tree 2016-06-20 11:38:21 -07:00
dir-iterator.h dir_iterator: new API for iterating over a directory tree 2016-06-20 11:38:21 -07:00
dir.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
dir.h Merge branch 'sl/clean-d-ignored-fix' 2017-06-02 15:06:05 +09:00
editor.c editor.c: use error_errno() 2016-05-09 12:29:08 -07:00
entry.c entry.c: submodule recursing: respect force flag correctly 2017-04-18 21:18:29 -07:00
environment.c environment: store worktree in the_repository 2017-06-23 18:24:34 -07:00
exec_cmd.c Merge branch 'js/exec-path-coverity-workaround' into maint 2017-01-31 13:32:10 -08:00
exec_cmd.h common-main: stop munging argv[0] path 2016-11-29 11:01:48 -08:00
fast-import.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
fetch-pack.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
fetch-pack.h Rename sha1_array to oid_array 2017-03-31 08:33:56 -07:00
fmt-merge-msg.h
fsck.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
fsck.h Rename sha1_array to oid_array 2017-03-31 08:33:56 -07:00
generate-cmdlist.sh
gettext.c gettext: add is_utf8_locale() 2016-07-01 12:44:57 -07:00
gettext.h gettext: add is_utf8_locale() 2016-07-01 12:44:57 -07:00
git-add--interactive.perl add--interactive: drop diff.indentHeuristic handling 2017-05-09 12:24:35 +09:00
git-archimport.perl
git-bisect.sh i18n: unmark die messages for translation 2016-06-17 15:46:10 -07:00
git-compat-util.h Merge branch 'nd/fopen-errors' 2017-06-13 13:47:09 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl typofix: assorted typofixes in comments, documentation and messages 2016-05-06 13:16:37 -07:00
git-difftool--helper.sh difftool: always honor fatal error exit codes 2016-08-15 15:24:05 -07:00
git-filter-branch.sh git-filter-branch: be more direct in an error message 2017-05-12 15:27:10 +09:00
git-instaweb.sh
git-merge-octopus.sh git-merge-octopus: do not capitalize "octopus" 2016-09-08 12:17:10 -07:00
git-merge-one-file.sh Merge branch 'jk/no-diff-emit-common' into maint 2016-03-10 11:13:42 -08:00
git-merge-resolve.sh
git-mergetool--lib.sh mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2016-11-29 10:54:03 -08:00
git-mergetool.sh mergetool: fix running in subdir when rerere enabled 2017-01-10 13:22:51 -08:00
git-p4.py git-p4: don't use name-rev to get current branch 2017-04-16 21:13:26 -07:00
git-parse-remote.sh i18n: git-parse-remote.sh: mark strings for translation 2016-04-19 12:07:49 -07:00
git-quiltimport.sh
git-rebase--am.sh rebase: update comment about FreeBSD /bin/sh 2016-06-17 11:04:38 -07:00
git-rebase--interactive.sh doc: replace more gmane links 2017-05-09 21:13:13 -07:00
git-rebase--merge.sh Merge branch 'em/newer-freebsd-shells-are-fine-with-returns' into maint 2016-07-06 13:06:41 -07:00
git-rebase.sh Merge branch 'gb/rebase-signoff' 2017-04-26 15:39:02 +09:00
git-remote-testgit.sh
git-request-pull.sh request-pull: drop old USAGE stuff 2017-01-15 16:23:23 -08:00
git-send-email.perl Merge branch 'jt/send-email-validate-hook' 2017-06-02 15:06:00 +09:00
git-sh-i18n.sh i18n: rebase-interactive: mark here-doc strings for translation 2016-06-17 15:45:48 -07:00
git-sh-setup.sh Merge branch 'va/i18n-even-more' 2016-12-27 00:11:45 -08:00
git-stash.sh stash: keep untracked files intact in stash -k 2017-03-22 14:55:56 -07:00
git-submodule.sh submodule: prevent backslash expantion in submodule names 2017-04-16 20:09:36 -07:00
git-svn.perl git svn: fix authentication with 'branch' 2017-03-07 21:29:03 +00:00
git-web--browse.sh
git.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
git.rc
gpg-interface.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
gpg-interface.h gpg-interface, tag: add GPG_VERIFY_OMIT_STATUS flag 2017-01-17 16:10:22 -08:00
graph.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
graph.h graph: add support for --line-prefix on all graph-aware output 2016-08-31 18:07:09 -07:00
grep.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
grep.h Merge branch 'bw/object-id' 2017-06-19 12:38:44 -07:00
hash.h Makefile: add DC_SHA1 knob 2017-03-17 10:40:25 -07:00
hashmap.c hashmap: add disallow_rehash setting 2017-03-22 13:41:41 -07:00
hashmap.h hashmap: add disallow_rehash setting 2017-03-22 13:41:41 -07:00
help.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
help.h
hex.c Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZ 2017-03-26 22:08:21 -07:00
http-backend.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
http-fetch.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
http-push.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
http-walker.c Merge branch 'ew/http-alternates-as-redirects-warning' into maint 2017-03-28 13:52:23 -07:00
http.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
http.h http.postbuffer: allow full range of ssize_t values 2017-04-13 18:24:32 -07:00
ident.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
imap-send.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
iterator.h refs: introduce an iterator interface 2016-06-20 11:38:20 -07:00
khash.h convert trivial cases to ALLOC_ARRAY 2016-02-22 14:51:09 -08:00
kwset.c
kwset.h
levenshtein.c convert trivial cases to ALLOC_ARRAY 2016-02-22 14:51:09 -08:00
levenshtein.h
line-log.c diff-tree: convert diff_tree_sha1 to struct object_id 2017-06-05 11:23:58 +09:00
line-log.h
line-range.c use SWAP macro 2017-01-30 14:17:00 -08:00
line-range.h
list-objects.c Convert lookup_tree to struct object_id 2017-05-08 15:12:57 +09:00
list-objects.h list-objects: pass full pathname to callbacks 2016-03-16 10:41:04 -07:00
list.h list: avoid incompatibility with *BSD sys/queue.h 2016-07-18 11:06:51 -07:00
ll-merge.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
ll-merge.h
lockfile.c lockfile: LOCK_REPORT_ON_ERROR 2016-12-07 11:31:59 -08:00
lockfile.h lockfile: add a new method, is_lock_file_locked() 2017-05-23 14:29:54 +09:00
log-tree.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
log-tree.h pretty: use fmt_output_email_subject() 2017-03-01 15:09:17 -08:00
mailinfo.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
mailinfo.h mailinfo: handle in-body header continuations 2016-09-21 10:23:11 -07:00
mailmap.c cocci: refactor common patterns to use xstrdup_or_null() 2016-10-12 11:22:10 -07:00
mailmap.h
match-trees.c match-trees: convert several leaf functions to use struct object_id 2016-04-25 14:26:29 -07:00
merge-blobs.c Merge branch 'jk/no-diff-emit-common' into maint 2016-03-10 11:13:42 -08:00
merge-blobs.h
merge-recursive.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
merge-recursive.h merge-recursive: offer an option to retain the output in 'obuf' 2016-08-01 11:45:30 -07:00
merge.c tree: convert parse_tree_indirect to struct object_id 2017-05-08 15:12:58 +09:00
mergesort.c
mergesort.h
mru.c add generic most-recently-used list 2016-07-29 11:05:07 -07:00
mru.h add generic most-recently-used list 2016-07-29 11:05:07 -07:00
name-hash.c name-hash: fix buffer overrun 2017-03-31 20:57:18 -07:00
notes-cache.c notes: convert some accessor functions to struct object_id 2017-06-02 09:36:06 +09:00
notes-cache.h notes-cache: convert to struct object_id 2017-05-08 15:12:57 +09:00
notes-merge.c diff-tree: convert diff_tree_sha1 to struct object_id 2017-06-05 11:23:58 +09:00
notes-merge.h notes-merge: convert notes_merge* to struct object_id 2017-06-05 11:23:58 +09:00
notes-utils.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
notes-utils.h builtin/notes: convert to struct object_id 2017-06-02 09:36:06 +09:00
notes.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
notes.h notes: convert some accessor functions to struct object_id 2017-06-02 09:36:06 +09:00
object.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
object.h object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
oidset.c add oidset API 2017-02-08 15:39:55 -08:00
oidset.h add oidset API 2017-02-08 15:39:55 -08:00
pack-bitmap-write.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
pack-bitmap.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
pack-bitmap.h
pack-check.c Convert the verify_pack callback to struct object_id 2017-05-08 15:12:57 +09:00
pack-objects.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
pack-objects.h pack-objects: enforce --depth limit in reused deltas 2017-01-27 16:24:44 -08:00
pack-revindex.c use SWAP macro 2017-01-30 14:17:00 -08:00
pack-revindex.h
pack-write.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
pack.h Convert the verify_pack callback to struct object_id 2017-05-08 15:12:57 +09:00
pager.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
parse-options-cb.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
parse-options.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
parse-options.h ref-filter: add --no-contains option to tag/branch/for-each-ref 2017-03-24 12:15:26 -07:00
patch-delta.c
patch-ids.c diff-tree: convert diff_tree_sha1 to struct object_id 2017-06-05 11:23:58 +09:00
patch-ids.h patch-ids: convert to struct object_id 2017-06-02 09:36:07 +09:00
path.c path: worktree_git_path() should not use file relocation 2017-06-23 18:24:34 -07:00
path.h path: convert strbuf_git_common_path to take a 'struct repository' 2017-06-23 18:24:34 -07:00
pathspec.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
pathspec.h pathspec: convert find_pathspecs_matching_against_index to take an index 2017-05-12 14:23:46 +09:00
pkt-line.c convert: move packet_write_line() into pkt-line as packet_writel() 2017-05-08 10:57:26 +09:00
pkt-line.h pkt-line: annotate packet_writel with LAST_ARG_MUST_BE_NULL 2017-05-15 13:01:36 +09:00
preload-index.c preload-index: avoid lstat for skip-worktree items 2017-02-10 14:44:18 -08:00
pretty.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
prio-queue.c Merge branch 'jk/prio-queue-avoid-swap-with-self' 2017-05-01 14:14:43 +09:00
prio-queue.h
progress.c stop_progress_msg: convert xsnprintf to xstrfmt 2017-02-16 11:28:02 -08:00
progress.h
prompt.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
prompt.h
quote.c Merge branch 'nd/icase' into maint 2016-07-28 11:26:03 -07:00
quote.h Merge branch 'nd/icase' into maint 2016-07-28 11:26:03 -07:00
reachable.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
reachable.h timestamp_t: a new data type for timestamps 2017-04-27 13:07:39 +09:00
read-cache.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
ref-filter.c Merge branch 'mh/packed-ref-store-prep' 2017-06-05 09:18:11 +09:00
ref-filter.h Convert struct ref_array_item to struct object_id 2017-05-08 15:12:57 +09:00
reflog-walk.c Merge branch 'js/plug-leaks' 2017-05-29 12:34:44 +09:00
reflog-walk.h
refs.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
refs.h Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
remote-curl.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
remote-testsvn.c Merge branch 'bw/object-id' 2017-06-19 12:38:44 -07:00
remote.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
remote.h Merge branch 'bw/push-options-recursively-to-submodules' 2017-04-19 21:37:14 -07:00
replace_object.c
repository.c repository: introduce the repository object 2017-06-23 18:24:34 -07:00
repository.h repository: introduce the repository object 2017-06-23 18:24:34 -07:00
rerere.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
rerere.h Merge branch 'jc/rerere-multi' 2016-04-25 15:17:15 -07:00
resolve-undo.c cache: convert struct cache_entry to use struct object_id 2016-09-07 12:59:42 -07:00
resolve-undo.h
revision.c Merge branch 'bw/object-id' 2017-06-19 12:38:44 -07:00
revision.h Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
run-command.c run-command: restrict PATH search to executable files 2017-04-25 23:17:36 -07:00
run-command.h run-command: expose is_executable function 2017-04-25 18:45:29 -07:00
send-pack.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
send-pack.h Rename sha1_array to oid_array 2017-03-31 08:33:56 -07:00
sequencer.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
sequencer.h sequencer (rebase -i): learn about the 'verbose' mode 2017-01-09 14:57:29 -08:00
server-info.c Merge branch 'nd/fopen-errors' 2017-06-13 13:47:09 -07:00
setup.c environment: place key repository state in the_repository 2017-06-23 18:24:34 -07:00
sh-i18n--envsubst.c remove unnecessary check before QSORT 2016-09-29 15:42:18 -07:00
sha1-array.c Rename sha1_array to oid_array 2017-03-31 08:33:56 -07:00
sha1-array.h Rename sha1_array to oid_array 2017-03-31 08:33:56 -07:00
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
sha1_name.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
sha1dc_git.c sha1dc: update from upstream 2017-05-22 10:20:46 +09:00
sha1dc_git.h sha1dc: update from upstream 2017-05-22 10:20:46 +09:00
shallow.c Merge branch 'js/plug-leaks' 2017-05-29 12:34:44 +09:00
shell.c Merge branch 'maint-2.8' into maint-2.9 2017-05-05 13:13:48 +09:00
shortlog.h shortlog: group by committer information 2016-12-15 16:19:13 -08:00
show-index.c common-main: call git_setup_gettext() 2016-07-01 15:09:10 -07:00
sideband.c Merge branch 'lf/recv-sideband-cleanup' into maint 2016-08-08 14:21:41 -07:00
sideband.h sideband.c: make send_sideband() return void 2016-06-16 11:40:19 -07:00
sigchain.c
sigchain.h
split-index.c split-index: add and use unshare_split_index() 2017-05-08 10:50:20 +09:00
split-index.h split-index: add and use unshare_split_index() 2017-05-08 10:50:20 +09:00
strbuf.c Merge branch 'rs/freebsd-getcwd-workaround' 2017-03-30 14:07:15 -07:00
strbuf.h Merge branch 'jk/interpret-branch-name' into maint 2017-03-28 13:52:22 -07:00
streaming.c Merge branch 'jk/pack-objects-optim-mru' 2016-10-10 14:03:47 -07:00
streaming.h streaming: make stream_blob_to_fd take struct object_id 2016-09-07 12:59:42 -07:00
string-list.c Merge branch 'bw/forking-and-threading' into maint 2017-06-13 13:27:00 -07:00
string-list.h string-list: add string_list_remove function 2017-04-20 17:55:32 -07:00
sub-process.c convert: update subprocess_read_status() to not die on EOF 2017-05-15 13:01:57 +09:00
sub-process.h sub-process: correct path to API docs in a comment 2017-06-15 14:33:31 -07:00
submodule-config.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
submodule-config.h update submodules: add submodule config parsing 2017-03-15 18:15:54 -07:00
submodule.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
submodule.h Merge branch 'sb/submodule-blanket-recursive' 2017-06-13 13:47:07 -07:00
symlinks.c
tag.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
tag.h Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
tar.h
tempfile.c tempfile: set errno to a known value before calling ferror() 2017-02-17 14:40:29 -08:00
tempfile.h mingw: ensure temporary file handles are not inherited by child processes 2016-08-23 09:09:55 -07:00
thread-utils.c
thread-utils.h
tmp-objdir.c tmp-objdir: quote paths we add to alternates 2016-12-12 15:10:46 -08:00
tmp-objdir.h tmp-objdir: introduce API for temporary object directories 2016-10-10 13:54:02 -07:00
trace.c trace: do not fall back to stderr 2016-08-05 09:28:17 -07:00
trace.h
trailer.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
trailer.h trailer: have function to describe trailer layout 2016-11-29 14:22:18 -08:00
transport-helper.c transport-helper: replace checked snprintf with xsnprintf 2017-03-30 14:59:50 -07:00
transport.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
transport.h for_each_alternate_ref: pass name/oid instead of ref struct 2017-02-08 15:39:55 -08:00
tree-diff.c tree-diff: convert path_appendnew to object_id 2017-06-05 11:23:58 +09:00
tree-walk.c Merge branch 'jk/diff-blob' 2017-06-02 15:06:05 +09:00
tree-walk.h fsck: handle bad trees like other errors 2016-09-27 14:09:10 -07:00
tree.c tree: convert read_tree to take an index parameter 2017-06-13 11:40:51 -07:00
tree.h tree: convert read_tree to take an index parameter 2017-06-13 11:40:51 -07:00
unicode_width.h unicode_width.h: update the width tables to Unicode 9.0 2016-12-14 09:48:07 -08:00
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
unpack-trees.h unpack-trees: check if we can perform the operation for submodules 2017-03-16 14:07:16 -07:00
upload-pack.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
url.c introduce hex2chr() for converting two hexadecimal digits to a character 2016-09-07 10:42:46 -07:00
url.h
urlmatch.c urlmatch: allow globbing for the URL host part 2017-02-01 13:22:50 -08:00
urlmatch.h urlmatch: include host in urlmatch ranking 2017-02-01 13:22:46 -08:00
usage.c Merge branch 'bw/forking-and-threading' into maint 2017-06-13 13:27:00 -07:00
userdiff.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
userdiff.h diff: clarify textconv interface 2016-02-22 10:40:35 -08:00
utf8.c utf8: accept "latin-1" as ISO-8859-1 2016-09-26 18:16:23 -07:00
utf8.h typofix: assorted typofixes in comments, documentation and messages 2016-05-06 13:16:37 -07:00
varint.c
varint.h
version.c
version.h
versioncmp.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
walker.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
walker.h walker: let walker_say take arbitrary formats 2016-07-08 10:11:23 -07:00
wildmatch.c typofix: assorted typofixes in comments, documentation and messages 2016-05-06 13:16:37 -07:00
wildmatch.h
worktree.c path: convert strbuf_git_common_path to take a 'struct repository' 2017-06-23 18:24:34 -07:00
worktree.h worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe() 2017-04-24 21:28:55 -07:00
wrap-for-bin.sh wrap-for-bin.sh: regenerate bin-wrappers when switching branches 2016-05-10 13:23:34 -07:00
wrapper.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
write_or_die.c run-command: move check_pipe() from write_or_die to run_command 2016-10-17 11:36:49 -07:00
ws.c attr: convert git_check_attrs() callers to use the new API 2017-02-01 13:46:52 -08:00
wt-status.c Merge branch 'nd/fopen-errors' 2017-06-13 13:47:09 -07:00
wt-status.h interpret-trailers: honor the cut line 2017-05-18 15:00:48 +09:00
xdiff-interface.c Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object 2017-06-23 18:24:00 -07:00
xdiff-interface.h Convert read_mmblob to take struct object_id. 2016-09-07 12:59:42 -07:00
zlib.c

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