Go to file
Jonathan Tan d1035cac09 upload-pack: clear flags before each v2 request
Suppose a server has the following commit graph:

 A   B
  \ /
   O

We create a client by cloning A from the server with depth 1, and add
many commits to it (so that future fetches span multiple requests due to
lengthy negotiation). If it then fetches B using protocol v2, the fetch
spanning multiple requests, the resulting packfile does not contain O
even though the client did report that A is shallow.

This is because upload_pack_v2() can be called multiple times while
processing the same session. During the 2nd and all subsequent
invocations, some object flags remain from the previous invocations. In
particular, CLIENT_SHALLOW remains, preventing process_shallow() from
adding client-reported shallows to the "shallows" array, and hence
pack-objects not knowing about these client-reported shallows.

Therefore, teach upload_pack_v2() to clear object flags at the start of
each invocation. This has some other results:

 - THEY_HAVE gates addition of objects to have_obj in process_haves().
   Previously in upload_pack_v2(), have_obj needed to be static because
   once an object is added to have_obj, it is never readded and thus we
   needed to retain the contents of have_obj between invocations. Now
   that flags are cleared, this is no longer necessary. This patch does
   not change the behavior of ok_to_give_up() (THEY_HAVE is still set on
   each "have") and got_oid() (used only in non-v2)); THEY_HAVE is not
   used in any other function.

 - WANTED gates addition of objects to want_obj in parse_want() and
   parse_want_ref(). It is also used in receive_needs(), but that is
   only used in non-v2. For the same reasons as THEY_HAVE, want_obj no
   longer needs to be static in upload_pack_v2().

 - CLIENT_SHALLOW is changed as discussed above.

Clearing of the other 5 flags does not affect functionality in v2. (Note
that in non-v2, upload_pack() is only called once per process, so each
invocation starts with blank flags anyway.)

 - OUR_REF is only used in non-v2.

 - COMMON_KNOWN is only used as a scratch flag in ok_to_give_up().

 - SHALLOW is passed to invocations in deepen() and
   deepen_by_rev_list(), but upload-pack doesn't use it.

 - NOT_SHALLOW is used by send_shallow() and send_unshallow(), but
   invocations of those functions are always preceded by code that sets
   NOT_SHALLOW on the appropriate objects.

 - HIDDEN_REF is only used in non-v2.

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-10-19 12:04:53 +09:00
.github
Documentation Fourth batch for 2.20 2018-10-16 16:21:17 +09:00
block-sha1
builtin Merge branch 'jk/oideq-hasheq-cleanup' 2018-10-16 16:16:08 +09:00
ci Merge branch 'nd/pack-deltify-regression-fix' 2018-08-22 11:17:05 -07:00
compat compat/poll: prepare for targeting Windows Vista 2018-10-04 05:39:56 -07:00
contrib git-completion.bash: add completion for stash list 2018-10-07 10:05:49 +09:00
ewah ewah/ewok_rlw.h: add missing include (hdr-check) 2018-09-20 11:50:00 -07:00
git-gui
gitk-git
gitweb
mergetools
negotiator Merge branch 'jt/fetch-negotiator-skipping' 2018-08-02 15:30:46 -07:00
perl
po l10n: zh_CN: for git v2.19.0 l10n round 1 to 2 2018-09-09 22:38:39 +08:00
ppc
refs Merge branch 'rj/header-check' 2018-10-16 16:16:00 +09:00
sha1collisiondetection@232357eb2e sha1dc: update from upstream 2018-08-02 13:54:58 -07:00
sha1dc sha1dc: update from upstream 2018-08-02 13:54:58 -07:00
t upload-pack: clear flags before each v2 request 2018-10-19 12:04:53 +09:00
templates
vcs-svn
xdiff Merge branch 'sb/indent-heuristic-optim' 2018-08-17 13:09:57 -07:00
.clang-format
.gitattributes .gitattributes: add conflict-marker-size for relevant files 2018-08-29 11:27:31 -07:00
.gitignore Sync 'ds/multi-pack-index' to v2.19.0-rc0 2018-08-20 15:29:54 -07:00
.gitmodules
.mailmap Merge branch 'jn/mailmap-update' 2018-10-16 16:16:01 +09:00
.travis.yml travis-ci: run gcc-8 on linux-gcc jobs 2018-05-21 14:14:09 +09:00
.tsan-suppressions
COPYING
GIT-VERSION-GEN Git 2.19.1 2018-09-27 11:52:33 -07:00
INSTALL
LGPL-2.1
Makefile Merge branch 'rj/header-check' 2018-10-16 16:16:00 +09:00
README.md note git-security@googlegroups.com in more places 2018-06-01 09:24:11 +09:00
RelNotes Declare that the next one will be named 2.20 2018-10-10 09:20:03 +09:00
abspath.c
aclocal.m4
advice.c Merge branch 'ab/checkout-default-remote' 2018-08-02 15:30:41 -07:00
advice.h Merge branch 'ab/checkout-default-remote' 2018-08-02 15:30:41 -07:00
alias.c completion: add and use --list-cmds=alias 2018-05-21 13:23:14 +09:00
alias.h completion: add and use --list-cmds=alias 2018-05-21 13:23:14 +09:00
alloc.c alloc: make allocate_alloc_state and clear_alloc_state more consistent 2018-08-15 11:52:09 -07:00
alloc.h alloc: make allocate_alloc_state and clear_alloc_state more consistent 2018-08-15 11:52:09 -07:00
apply.c apply.c: remove implicit dependency on the_index 2018-08-13 14:14:44 -07:00
apply.h Merge branch 'en/incl-forward-decl' 2018-08-20 12:41:32 -07:00
archive-tar.c Merge branch 'nd/no-the-index' 2018-08-20 11:33:53 -07:00
archive-zip.c Merge branch 'nd/no-the-index' 2018-08-20 11:33:53 -07:00
archive.c Make git_check_attr() a void function 2018-09-12 15:15:34 -07:00
archive.h Merge branch 'en/incl-forward-decl' 2018-08-20 12:41:32 -07:00
argv-array.c Merge branch 'ma/unpack-trees-free-msgs' 2018-05-30 21:51:29 +09:00
argv-array.h Merge branch 'ma/unpack-trees-free-msgs' 2018-05-30 21:51:29 +09:00
attr.c Make git_check_attr() a void function 2018-09-12 15:15:34 -07:00
attr.h Make git_check_attr() a void function 2018-09-12 15:15:34 -07:00
banned.h banned.h: mark strncpy() as banned 2018-07-26 10:12:51 -07:00
base85.c
bisect.c Merge branch 'nd/bisect-show-list-fix' 2018-09-17 13:54:00 -07:00
bisect.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
blame.c convert "oidcmp() != 0" to "!oideq()" 2018-08-29 11:32:49 -07:00
blame.h blame.c: remove implicit dependency on the_index 2018-08-13 14:14:44 -07:00
blob.c blob: allow lookup_blob to handle arbitrary repositories 2018-06-29 10:43:39 -07:00
blob.h blob: allow lookup_blob to handle arbitrary repositories 2018-06-29 10:43:39 -07:00
branch.c Merge branch 'ab/unconditional-free-and-null' 2018-08-27 14:33:42 -07:00
branch.h Move definition of enum branch_track from cache.h to branch.h 2018-08-15 11:52:09 -07:00
builtin.h Sync 'ds/multi-pack-index' to v2.19.0-rc0 2018-08-20 15:29:54 -07:00
bulk-checkin.c convert "oidcmp() == 0" to oideq() 2018-08-29 11:32:49 -07:00
bulk-checkin.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
bundle.c convert "oidcmp() != 0" to "!oideq()" 2018-08-29 11:32:49 -07:00
bundle.h
cache-tree.c more oideq/hasheq conversions 2018-10-04 03:42:48 -07:00
cache-tree.h Merge branch 'nd/unpack-trees-with-cache-tree' 2018-09-17 13:53:53 -07:00
cache.h Merge branch 'jk/cocci' 2018-09-17 13:53:57 -07:00
chdir-notify.c
chdir-notify.h
check-builtins.sh
check-racy.c
check_bindir
checkout.c checkout & worktree: introduce checkout.defaultRemote 2018-06-11 09:41:02 -07:00
checkout.h checkout: pass the "num_matches" up to callers 2018-06-11 09:41:01 -07:00
color.c color: protect against out-of-bounds reads and writes 2018-08-03 08:52:05 -07:00
color.h range-diff: use dim/bold cues to improve dual color mode 2018-08-13 10:44:52 -07:00
column.c
column.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
combine-diff.c convert "oidcmp() == 0" to oideq() 2018-08-29 11:32:49 -07:00
command-list.txt Sync 'ds/multi-pack-index' to v2.19.0-rc0 2018-08-20 15:29:54 -07:00
commit-graph.c Merge branch 'ds/commit-graph-with-grafts' 2018-10-16 16:15:59 +09:00
commit-graph.h Merge branch 'ds/commit-graph-with-grafts' 2018-10-16 16:15:59 +09:00
commit-reach.c Merge branch 'jk/oideq-hasheq-cleanup' 2018-10-16 16:16:08 +09:00
commit-reach.h commit-reach: make can_all_from_reach... linear 2018-07-20 15:38:56 -07:00
commit-slab-decl.h commit-slab: support shared commit-slab 2018-05-21 14:07:19 +09:00
commit-slab-impl.h commit-slabs: remove realloc counter outside of slab struct 2018-06-29 10:43:40 -07:00
commit-slab.h commit-slab: support shared commit-slab 2018-05-21 14:07:19 +09:00
commit.c Merge branch 'ds/commit-graph-with-grafts' 2018-10-16 16:15:59 +09:00
commit.h Merge branch 'ds/commit-graph-with-grafts' 2018-10-16 16:15:59 +09:00
common-main.c
config.c i18n: fix mistakes in translated strings 2018-08-23 14:29:12 -07:00
config.h Merge branch 'en/incl-forward-decl' 2018-08-20 12:41:32 -07:00
config.mak.dev Merge branch 'jk/dev-build-format-security' 2018-09-24 10:30:49 -07:00
config.mak.in
config.mak.uname mingw: bump the minimum Windows version to Vista 2018-10-04 05:39:56 -07:00
configure.ac
connect.c convert "oidcmp() == 0" to oideq() 2018-08-29 11:32:49 -07:00
connect.h fixup! connect.h: avoid forward declaration of an enum 2018-07-09 14:35:39 -07:00
connected.c fetch-pack: write shallow, then check connectivity 2018-07-03 14:57:44 -07:00
connected.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
convert.c Make git_check_attr() a void function 2018-09-12 15:15:34 -07:00
convert.h Merge branch 'en/incl-forward-decl' 2018-08-20 12:41:32 -07:00
copy.c
credential-cache--daemon.c
credential-cache.c
credential-store.c
credential.c
credential.h
csum-file.c
csum-file.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
ctype.c
daemon.c
date.c
decorate.c
decorate.h
delta-islands.c pack-objects: move 'layer' into 'struct packing_data' 2018-08-16 10:56:44 -07:00
delta-islands.h delta-islands.h: add missing forward declarations (hdr-check) 2018-09-20 11:50:43 -07:00
delta.h
detect-compiler
diff-delta.c
diff-lib.c Merge branch 'jk/cocci' 2018-09-17 13:53:57 -07:00
diff-no-index.c
diff.c Merge branch 'sb/diff-color-move-more' 2018-09-24 10:30:48 -07:00
diff.h Merge branch 'sb/range-diff-colors' 2018-09-17 13:53:54 -07:00
diffcore-break.c convert "oidcmp() == 0" to oideq() 2018-08-29 11:32:49 -07:00
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c regex: do not call `regfree()` if compilation fails 2018-05-21 13:58:32 +09:00
diffcore-rename.c convert "oidcmp() != 0" to "!oideq()" 2018-08-29 11:32:49 -07:00
diffcore.h Merge branch 'en/incl-forward-decl' 2018-08-20 12:41:32 -07:00
dir-iterator.c
dir-iterator.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
dir.c Merge branch 'jk/cocci' 2018-09-17 13:53:57 -07:00
dir.h dir.c: remove an implicit dependency on the_index in pathspec code 2018-08-13 14:14:42 -07:00
editor.c
entry.c Merge branch 'nd/clone-case-smashing-warning' 2018-09-17 13:53:47 -07:00
environment.c Merge branch 'en/incl-forward-decl' 2018-08-20 12:41:32 -07:00
exec-cmd.c exec-cmd.c: mark more strings for translation 2018-07-23 11:19:10 -07:00
exec-cmd.h
fast-import.c Merge branch 'jk/cocci' 2018-09-17 13:53:57 -07:00
fetch-negotiator.c negotiator: unknown fetch.negotiationAlgorithm should error out 2018-08-01 11:07:47 -07:00
fetch-negotiator.h negotiator/skipping: skip commits during fetch 2018-07-16 14:51:12 -07:00
fetch-object.c fetch-object: set exact_oid when fetching 2018-09-13 13:57:31 -07:00
fetch-object.h fetch-object: unify fetch_object[s] functions 2018-09-13 13:56:19 -07:00
fetch-pack.c convert "oidcmp() != 0" to "!oideq()" 2018-08-29 11:32:49 -07:00
fetch-pack.h Merge branch 'jt/fetch-nego-tip' 2018-08-02 15:30:43 -07:00
fmt-merge-msg.h
fsck.c Merge branch 'ab/fsck-skiplist' 2018-10-10 12:37:16 +09:00
fsck.h fsck: use oidset instead of oid_array for skipList 2018-09-12 15:17:46 -07:00
fsmonitor.c Merge branch 'jk/snprintf-truncation' 2018-05-30 21:51:28 +09:00
fsmonitor.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
generate-cmdlist.sh generate-cmdlist.sh: collect config from all config.txt files 2018-08-21 11:28:11 -07:00
gettext.c Merge branch 'js/runtime-prefix' 2018-05-08 15:59:34 +09:00
gettext.h
git-add--interactive.perl Merge branch 'pw/add-p-recount' 2018-06-28 12:53:32 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h mingw: bump the minimum Windows version to Vista 2018-10-04 05:39:56 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-filter-branch.sh Merge branch 'mb/filter-branch-optim' 2018-07-18 12:20:32 -07:00
git-instaweb.sh git-instaweb: fix apache2 config with apache >= 2.4 2018-08-08 08:30:07 -07:00
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh mergetool: don't suggest to continue after last file 2018-08-13 12:11:19 -07:00
git-p4.py git-p4: add the `p4-pre-submit` hook 2018-08-01 13:37:18 -07:00
git-parse-remote.sh
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh Merge branch 'ag/rebase-p' 2018-06-25 13:22:39 -07:00
git-rebase--merge.sh Merge branch 'en/rebase-i-microfixes' 2018-07-18 12:20:33 -07:00
git-rebase--preserve-merges.sh git-rebase--preserve-merges: fix formatting of todo help message 2018-07-06 12:09:27 -07:00
git-rebase.sh git-rebase.sh: fix typos in error messages 2018-09-28 14:55:12 -07:00
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl Merge branch 'jm/send-email-tls-auth-on-batch' 2018-08-02 15:30:46 -07:00
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh
git-submodule.sh Merge branch 'sb/submodule-update-in-c' 2018-09-17 13:53:51 -07:00
git-svn.perl
git-web--browse.sh
git.c Merge branch 'ts/alias-of-alias' 2018-10-16 16:15:59 +09:00
git.rc
gpg-interface.c Merge branch 'jc/gpg-status' 2018-08-20 11:33:50 -07:00
gpg-interface.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
graph.c
graph.h
grep.c Merge branch 'tb/grep-only-matching' 2018-08-02 15:30:44 -07:00
grep.h Merge branch 'tb/grep-only-matching' 2018-08-02 15:30:44 -07:00
hash.h
hashmap.c
hashmap.h
help.c Merge branch 'hn/highlight-sideband-keywords' 2018-08-20 12:41:34 -07:00
help.h sideband: highlight keywords in remote sideband output 2018-08-08 15:20:09 -07:00
hex.c hex: switch to using the_hash_algo 2018-07-16 14:27:39 -07:00
http-backend.c Merge branch 'ds/multi-pack-index' 2018-09-17 13:53:50 -07:00
http-fetch.c Merge branch 'ma/http-walker-no-partial' 2018-05-08 15:59:35 +09:00
http-push.c Merge branch 'jk/cocci' 2018-09-17 13:53:57 -07:00
http-walker.c convert "hashcmp() != 0" to "!hasheq()" 2018-08-29 11:32:49 -07:00
http.c convert "hashcmp() != 0" to "!hasheq()" 2018-08-29 11:32:49 -07:00
http.h Merge branch 'jk/snprintf-truncation' 2018-05-30 21:51:28 +09:00
ident.c
imap-send.c
interdiff.c interdiff: teach show_interdiff() to indent interdiff 2018-07-23 12:50:06 -07:00
interdiff.h interdiff: teach show_interdiff() to indent interdiff 2018-07-23 12:50:06 -07:00
iterator.h
json-writer.c json_writer: new routines to create JSON data 2018-07-16 13:55:39 -07:00
json-writer.h json-writer.h: add missing include (hdr-check) 2018-09-20 11:50:00 -07:00
khash.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
line-log.h
line-range.c blame: prevent error if range ends past end of file 2018-06-15 10:29:13 -07:00
line-range.h line-range.h: drop extern from function declaration 2018-08-03 10:42:55 -07:00
linear-assignment.c linear-assignment: fix potential out of bounds memory access 2018-09-14 09:10:26 -07:00
linear-assignment.h linear-assignment: a function to solve least-cost assignment problems 2018-08-13 10:44:50 -07:00
list-objects-filter-options.c list-objects: check if filter is NULL before using 2018-06-12 10:46:56 -07:00
list-objects-filter-options.h
list-objects-filter.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
list-objects-filter.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
list-objects.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
list-objects.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
list.h
ll-merge.c Make git_check_attr() a void function 2018-09-12 15:15:34 -07:00
ll-merge.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
lockfile.c
lockfile.h reopen_tempfile(): truncate opened file 2018-09-05 09:46:16 -07:00
log-tree.c Merge branch 'jk/cocci' 2018-09-17 13:53:57 -07:00
log-tree.h
ls-refs.c
ls-refs.h
mailinfo.c mailinfo: support format=flowed 2018-08-29 13:05:35 -07:00
mailinfo.h Merge branch 'rs/mailinfo-format-flowed' 2018-09-17 13:53:57 -07:00
mailmap.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
mailmap.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
match-trees.c convert "oidcmp() != 0" to "!oideq()" 2018-08-29 11:32:49 -07:00
mem-pool.c block alloc: add validations around cache_entry lifecyle 2018-07-03 10:58:27 -07:00
mem-pool.h block alloc: add validations around cache_entry lifecyle 2018-07-03 10:58:27 -07:00
merge-blobs.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
merge-blobs.h
merge-recursive.c Merge branch 'en/merge-cleanup' 2018-10-16 16:16:00 +09:00
merge-recursive.h Merge branch 'en/directory-renames-nothanks' 2018-09-04 14:31:38 -07:00
merge.c Merge branch 'en/dirty-merge-fixes' 2018-08-02 15:30:45 -07:00
mergesort.c
mergesort.h
midx.c Merge branch 'jk/oideq-hasheq-cleanup' 2018-10-16 16:16:08 +09:00
midx.h Merge branch 'rj/header-check' 2018-10-16 16:16:00 +09:00
name-hash.c trace.h: support nested performance tracing 2018-08-18 09:47:46 -07:00
notes-cache.c commit: add repository argument to lookup_commit_reference_gently 2018-06-29 10:43:39 -07:00
notes-cache.h
notes-merge.c Merge branch 'jk/cocci' 2018-09-17 13:53:57 -07:00
notes-merge.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
notes-utils.c commit: add repository argument to lookup_commit 2018-06-29 10:43:39 -07:00
notes-utils.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
notes.c convert "oidcmp() != 0" to "!oideq()" 2018-08-29 11:32:49 -07:00
notes.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
object-store.h packfile: add all_packs list 2018-08-20 15:31:40 -07:00
object.c convert "hashcmp() == 0" to hasheq() 2018-08-29 11:32:49 -07:00
object.h Merge branch 'ds/reachable' 2018-09-17 13:53:52 -07:00
oidmap.c convert hashmap comparison functions to oideq() 2018-08-29 11:32:49 -07:00
oidmap.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
oidset.c
oidset.h
pack-bitmap-write.c Merge branch 'ds/reachable' 2018-09-17 13:53:52 -07:00
pack-bitmap.c Merge branch 'jk/pack-objects-with-bitmap-fix' 2018-09-17 13:53:58 -07:00
pack-bitmap.h bitmap_has_sha1_in_uninteresting(): drop BUG check 2018-09-04 08:30:48 -07:00
pack-check.c convert "hashcmp() != 0" to "!hasheq()" 2018-08-29 11:32:49 -07:00
pack-objects.c Merge branch 'jk/cocci' 2018-09-17 13:53:57 -07:00
pack-objects.h Merge branch 'cc/delta-islands' 2018-09-17 13:53:55 -07:00
pack-revindex.c
pack-revindex.h
pack-write.c convert "hashcmp() != 0" to "!hasheq()" 2018-08-29 11:32:49 -07:00
pack.h
packfile.c Merge branch 'jk/cocci' 2018-09-17 13:53:57 -07:00
packfile.h packfile: add all_packs list 2018-08-20 15:31:40 -07:00
pager.c Merge branch 'nd/command-list' 2018-06-01 15:06:37 +09:00
parse-options-cb.c commit: add repository argument to lookup_commit_reference 2018-06-29 10:43:39 -07:00
parse-options.c Merge branch 'rs/parse-opt-lithelp' 2018-08-17 13:09:56 -07:00
parse-options.h
patch-delta.c patch-delta: handle truncated copy parameters 2018-08-30 10:30:23 -07:00
patch-ids.c convert hashmap comparison functions to oideq() 2018-08-29 11:32:49 -07:00
patch-ids.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
path.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
path.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
pathspec.c pathspec.c: use the right index instead of the_index 2018-08-13 14:14:43 -07:00
pathspec.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
pkt-line.c pkt-line.c: mark more strings for translation 2018-07-23 11:19:10 -07:00
pkt-line.h
preload-index.c Merge branch 'nd/unpack-trees-with-cache-tree' 2018-09-17 13:53:53 -07:00
pretty.c Merge branch 'jk/trailer-fixes' 2018-09-17 13:53:54 -07:00
pretty.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
prio-queue.c
prio-queue.h
progress.c
progress.h
prompt.c
prompt.h
protocol.c
protocol.h
quote.c
quote.h
range-diff.c Merge branch 'es/format-patch-rangediff' 2018-09-17 13:53:56 -07:00
range-diff.h range-diff: relieve callers of low-level configuration burden 2018-08-14 14:27:04 -07:00
reachable.c tree: add repository argument to lookup_tree 2018-06-29 10:43:38 -07:00
reachable.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
read-cache.c Merge branch 'jk/cocci' 2018-09-17 13:53:57 -07:00
ref-filter.c Merge branch 'jk/trailer-fixes' 2018-09-17 13:53:54 -07:00
ref-filter.h
reflog-walk.c Merge branch 'nd/i18n' 2018-08-15 15:08:23 -07:00
reflog-walk.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
refs.c Merge branch 'ds/commit-graph-with-grafts' 2018-10-16 16:15:59 +09:00
refs.h Merge branch 'ds/commit-graph-with-grafts' 2018-10-16 16:15:59 +09:00
refspec.c refspec.c: mark more strings for translation 2018-07-23 11:19:10 -07:00
refspec.h refspec: add back a refspec_item_init() function 2018-06-11 10:11:31 -07:00
remote-curl.c Merge branch 'en/double-semicolon-fix' 2018-09-24 10:30:47 -07:00
remote-testsvn.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
remote.c Merge branch 'jk/cocci' 2018-09-17 13:53:57 -07:00
remote.h Merge branch 'ds/reachable' 2018-09-17 13:53:52 -07:00
replace-object.c Merge branch 'ds/commit-graph-with-grafts' 2018-10-16 16:15:59 +09:00
replace-object.h commit-graph: not compatible with replace objects 2018-08-21 10:22:51 -07:00
repository.c Merge branch 'sb/object-store-alloc' 2018-06-25 13:22:38 -07:00
repository.h Merge branch 'en/incl-forward-decl' 2018-08-20 12:41:32 -07:00
rerere.c Merge branch 'en/rerere-multi-stage-1-fix' 2018-09-24 10:30:48 -07:00
rerere.h rerere.h: drop extern from function declaration 2018-08-03 10:42:55 -07:00
resolve-undo.c resolve-undo.c: use the right index instead of the_index 2018-08-13 14:14:44 -07:00
resolve-undo.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
revision.c Merge branch 'jk/cocci' 2018-09-17 13:53:57 -07:00
revision.h Merge branch 'es/format-patch-rangediff' 2018-09-17 13:53:56 -07:00
run-command.c
run-command.h
send-pack.c shallow: add repository argument to is_repository_shallow 2018-05-18 08:13:10 +09:00
send-pack.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
sequencer.c Merge branch 'rs/sequencer-oidset-insert-avoids-dups' 2018-10-16 16:16:08 +09:00
sequencer.h Merge branch 'jk/trailer-fixes' 2018-09-17 13:53:54 -07:00
serve.c
serve.h
server-info.c treewide: use get_all_packs 2018-08-20 15:31:40 -07:00
setup.c
sh-i18n--envsubst.c
sha1-array.c convert "oidcmp() == 0" to oideq() 2018-08-29 11:32:49 -07:00
sha1-array.h get_short_oid: sort ambiguous objects by type, then SHA-1 2018-05-11 14:43:23 +09:00
sha1-file.c Merge branch 'jt/lazy-object-fetch-fix' 2018-09-24 10:30:52 -07:00
sha1-lookup.c
sha1-lookup.h
sha1-name.c Merge branch 'jk/cocci' 2018-09-17 13:53:57 -07:00
sha1dc_git.c
sha1dc_git.h
shallow.c commit.h: remove method declarations 2018-07-20 15:38:54 -07:00
shell.c Merge branch 'nd/command-list' 2018-06-01 15:06:37 +09:00
shortlog.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
sideband.c sideband: do not read beyond the end of input 2018-08-18 09:16:48 -07:00
sideband.h
sigchain.c
sigchain.h
split-index.c block alloc: allocate cache entries from mem_pool 2018-07-03 10:58:27 -07:00
split-index.h
strbuf.c Merge branch 'jk/size-t' 2018-08-15 15:08:25 -07:00
strbuf.h Merge branch 'en/rename-directory-detection-reboot' 2018-05-23 14:38:19 +09:00
streaming.c
streaming.h
string-list.c Merge branch 'sb/string-list-remove-unused' 2018-09-24 10:30:50 -07:00
string-list.h string-list: remove unused function print_string_list 2018-09-11 12:27:58 -07:00
sub-process.c
sub-process.h
submodule-config.c Sync with 2.19.1 2018-09-27 11:53:39 -07:00
submodule-config.h submodule-config: make 'config_from_gitmodules' private 2018-06-26 12:56:12 -07:00
submodule.c Merge branch 'bp/mv-submodules-with-fsmonitor' 2018-09-24 10:30:46 -07:00
submodule.h Revert "Merge branch 'sb/submodule-core-worktree'" 2018-09-07 19:05:20 -07:00
symlinks.c
tag.c Merge branch 'jt/tags-to-promised-blobs-fix' 2018-08-02 15:30:46 -07:00
tag.h tag.c: allow deref_tag to handle arbitrary repositories 2018-06-29 10:43:40 -07:00
tar.h
tempfile.c reopen_tempfile(): truncate opened file 2018-09-05 09:46:16 -07:00
tempfile.h Merge branch 'jk/reopen-tempfile-truncate' 2018-09-24 10:30:46 -07:00
thread-utils.c
thread-utils.h
tmp-objdir.c
tmp-objdir.h
trace.c trace.h: support nested performance tracing 2018-08-18 09:47:46 -07:00
trace.h trace.h: support nested performance tracing 2018-08-18 09:47:46 -07:00
trailer.c interpret-trailers: allow suppressing "---" divider 2018-08-23 10:08:51 -07:00
trailer.h Merge branch 'jk/trailer-fixes' 2018-09-17 13:53:54 -07:00
transport-helper.c Merge branch 'jt/connectivity-check-after-unshallow' 2018-08-15 15:08:28 -07:00
transport-internal.h fetch-pack: unify ref in and out param 2018-08-01 15:00:52 -07:00
transport.c convert "oidcmp() == 0" to oideq() 2018-08-29 11:32:49 -07:00
transport.h Merge branch 'jt/connectivity-check-after-unshallow' 2018-08-15 15:08:28 -07:00
tree-diff.c convert "oidcmp() != 0" to "!oideq()" 2018-08-29 11:32:49 -07:00
tree-walk.c Merge branch 'bc/object-id' 2018-08-02 15:30:39 -07:00
tree-walk.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
tree.c Merge branch 'jm/cache-entry-from-mem-pool' 2018-08-02 15:30:43 -07:00
tree.h tree: allow lookup_tree to handle arbitrary repositories 2018-06-29 10:43:39 -07:00
unicode-width.h unicode: update the width tables to Unicode 11 2018-07-09 14:02:51 -07:00
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'jt/lazy-object-fetch-fix' 2018-09-24 10:30:52 -07:00
unpack-trees.h Merge branch 'nd/clone-case-smashing-warning' 2018-09-17 13:53:47 -07:00
upload-pack.c upload-pack: clear flags before each v2 request 2018-10-19 12:04:53 +09:00
upload-pack.h
url.c
url.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
urlmatch.c
urlmatch.h urlmatch.h: fix include guard 2018-08-15 11:52:09 -07:00
usage.c Merge branch 'jk/snprintf-truncation' 2018-05-30 21:51:28 +09:00
userdiff.c Make git_check_attr() a void function 2018-09-12 15:15:34 -07:00
userdiff.h
utf8.c Merge branch 'jk/size-t' 2018-08-15 15:08:25 -07:00
utf8.h Merge branch 'en/incl-forward-decl' 2018-08-20 12:41:32 -07:00
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
walker.h
wildmatch.c
wildmatch.h
worktree.c worktree: don't die() in library function find_worktree() 2018-08-30 09:28:02 -07:00
worktree.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
wrap-for-bin.sh
wrapper.c
write-or-die.c
ws.c Make git_check_attr() a void function 2018-09-12 15:15:34 -07:00
wt-status.c convert "oidcmp() == 0" to oideq() 2018-08-29 11:32:49 -07:00
wt-status.h add status config and command line options for rename detection 2018-05-13 10:57:37 +09:00
xdiff-interface.c convert "oidcmp() == 0" to oideq() 2018-08-29 11:32:49 -07:00
xdiff-interface.h
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.

Issues which are security relevant should be disclosed privately to the Git Security mailing list git-security@googlegroups.com.

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