microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
A fork of Git containing Microsoft-specific patches.
66 659 коммитов 92 Ветки 771 Тег 436 MiB
C 51.7%
Shell 36.9%
Perl 5.3%
Tcl 3.4%
Python 0.8%
Разное 1.7%
Перейти к файлу
Jeff King 3d8314f8d1 clone: propagate empty remote HEAD even with other branches 
Unless "--branch" was given, clone generally tries to match the local
HEAD to the remote one. For most repositories, this is easy: the remote
tells us which branch HEAD was pointing to, and we call our local
checkout() function on that branch.

When cloning an empty repository, it's a little more tricky: we have
special code that checks the transport's "unborn" extension, or falls back
to our local idea of what the default branch should be. In either case,
we point the new HEAD to that, and set up the branch.* config.

But that leaves one case unhandled: when the remote repository _isn't_
empty, but its HEAD is unborn. The checkout() function is smart enough
to realize we didn't fetch the remote HEAD and it bails with a warning.
But we'll have ignored any information the remote gave us via the unborn
extension. This leads to nonsense outcomes:

  - If the remote has its HEAD pointing to an unborn "foo" and contains
    another branch "bar", cloning will get branch "bar" but leave the
    local HEAD pointing at "master" (or whatever our local default is),
    which is useless. The project does not use "master" as a branch.

  - Worse, if the other branch "bar" is instead called "master" (but
    again, the remote HEAD is not pointing to it), then we end up with a
    local unborn branch "master", which is not connected to the remote
    "master" (it shares no history, and there's no branch.* config).

Instead, we should try to use the remote's HEAD, even if its unborn, to
be consistent with the other cases.

The reason this case was missed is that cmd_clone() handles empty and
non-empty repositories on two different sides of a conditional:

  if (we have any refs) {
      fetch refs;
      check for --branch;
      otherwise, try to point our head at remote head;
      otherwise, our head is NULL;
  } else {
      check for --branch;
      otherwise, try to use "unborn" extension;
      otherwise, fall back to our default name name;
  }

So the smallest change would be to repeat the "unborn" logic at the end
of the first block. But we can note some other overlaps and
inconsistencies:

  - both sides have to handle --branch (though note that it's always an
    error for the empty repo case, since an empty repo by definition
    does not have a matching branch)

  - the fall back to the default name is much more explicit in the
    empty-repo case. The non-empty case eventually ends up bailing
    from checkout() with a warning, which produces a similar result, but
    fails to set up the branch config we do in the empty case.

So let's pull the HEAD setup out of this conditional entirely. This
de-duplicates some of the code and the result is easy to follow, because
helper functions like find_ref_by_name() do the right thing even in the
empty-repo case (i.e., by returning NULL).

There are two subtleties:

  - for a remote with a detached HEAD, it will advertise an oid for HEAD
    (which we store in our "remote_head" variable), but we won't find a
    matching refname (so our "remote_head_points_at" is NULL). In this
    case we make a local detached HEAD to match. Right now this happens
    implicitly by reaching update_head() with a non-NULL remote_head
    (since we skip all of the unborn-fallback). We'll now need to
    account for it explicitly before doing the fallback.

  - for an empty repo, we issue a warning to the user that they've
    cloned an empty repo. The text of that warning doesn't make sense
    for a non-empty repo with an unborn HEAD, so we'll have to
    differentiate the two cases there. We could just use different text,
    but instead let's allow the code to continue down to checkout(),
    which will issue an appropriate warning, like:

      remote HEAD refers to nonexistent ref, unable to checkout

    Continuing down to checkout() will make it easier to do more fixes
    on top (see below).

Note that this patch fixes the case where the other side reports an
unborn head to us using the protocol extension. It _doesn't_ fix the
case where the other side doesn't tell us, we locally guess "master",
and the other side happens to have a "master" which its HEAD doesn't
point. But it doesn't make anything worse there, and it should actually
make it easier to fix that problem on top.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 		2022-07-07 20:57:54 -07:00
.github Merge branch 'ab/ci-updates' 2021-12-15 09:39:49 -08:00
Documentation Prepare for 2.36.2 2022-06-08 14:27:53 -07:00
block-sha1 block-sha1: remove use of obsolete x86 assembly 2022-03-10 11:18:05 -08:00
builtin clone: propagate empty remote HEAD even with other branches 2022-07-07 20:57:54 -07:00
ci Merge branch 'cb/ci-make-p4-optional' into maint 2022-06-08 14:27:51 -07:00
compat Merge branch 'js/ci-gcc-12-fixes' into maint 2022-06-08 14:27:50 -07:00
contrib cocci: drop bogus xstrdup_or_null() rule 2022-04-30 22:23:11 -07:00
ewah use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
git-gui Merge https://github.com/prati0100/git-gui 2021-03-04 12:38:50 -08:00
gitk-git
…
gitweb gitweb: remove invalid http-equiv="content-type" 2022-03-08 10:10:16 -08:00
mergetools mergetools/xxdiff: prevent segfaults from stopping difftool 2021-10-13 11:04:04 -07:00
negotiator use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
perl perl Git.pm: don't ignore signalled failure in _cmd_close() 2022-02-01 15:21:19 -08:00
po l10n: sv.po: Update Swedish translation (5282t0f0u) 2022-04-17 18:13:34 +01:00
ppc
…
refs Revert "Merge branch 'ps/avoid-unnecessary-hook-invocation-with-packed-refs'" 2022-04-13 15:51:33 -07:00
reftable reftable: make assignments portable to AIX xlc v12.01 2022-03-28 13:58:10 -07:00
sha1collisiondetection@855827c583
…
sha1dc
…
sha256
…
t clone: propagate empty remote HEAD even with other branches 2022-07-07 20:57:54 -07:00
templates Makefile: add "$(QUIET)" boilerplate to shared.mak 2022-03-03 14:14:55 -08:00
trace2 trace2: use designated initializers for "struct tr2_dst" 2022-02-24 15:58:55 -08:00
xdiff xdiff: handle allocation failure when merging 2022-02-16 10:58:16 -08:00
.cirrus.yml ci: update freebsd 12 cirrus job 2021-08-12 14:00:52 -07:00
.clang-format
…
.editorconfig
…
.gitattributes CoC: explicitly take any whitespace breakage 2021-01-04 09:44:49 -08:00
.gitignore fsmonitor--daemon: add a built-in fsmonitor daemon 2022-03-25 16:04:15 -07:00
.gitmodules
…
.mailmap mailmap: change primary address for Derrick Stolee 2022-02-14 13:27:31 -08:00
.tsan-suppressions
…
CODE_OF_CONDUCT.md CODE_OF_CONDUCT.md: update PLC members list 2022-02-18 12:36:29 -08:00
COPYING
…
GIT-VERSION-GEN Git 2.36.1 2022-05-05 14:36:37 -07:00
INSTALL INSTALL: mention that we need libcurl 7.19.4 or newer to build 2021-09-13 10:39:03 -07:00
LGPL-2.1
…
Makefile Merge branch 'pw/test-malloc-with-sanitize-address' into maint 2022-06-08 14:27:52 -07:00
README.md Merge branch 'po/readme-mention-contributor-hints' 2022-02-09 14:20:59 -08:00
RelNotes Prepare for 2.36.2 2022-06-08 14:27:53 -07:00
SECURITY.md SECURITY: describe how to report vulnerabilities 2021-03-27 15:13:02 -07:00
abspath.c
…
aclocal.m4
…
add-interactive.c Merge branch 'pw/single-key-interactive' 2022-03-21 15:14:24 -07:00
add-interactive.h
…
add-patch.c Merge branch 'pw/add-p-hunk-split-fix' 2022-02-09 14:20:59 -08:00
advice.c Merge branch 'tk/ambiguous-fetch-refspec' 2022-04-04 10:56:24 -07:00
advice.h Merge branch 'tk/ambiguous-fetch-refspec' 2022-04-04 10:56:24 -07:00
alias.c
…
alias.h
…
alloc.c
…
alloc.h
…
apply.c Merge branch 'ab/object-file-api-updates' 2022-03-16 17:53:08 -07:00
apply.h range-diff: plug memory leak in common invocation 2022-03-04 13:24:19 -08:00
archive-tar.c archive-*.c: use designated initializers for "struct archiver" 2022-02-24 15:59:20 -08:00
archive-zip.c Merge branch 'ab/c99-designated-initializers' 2022-03-06 21:25:32 -08:00
archive.c archive: do not let on-disk mode leak to zip archives 2022-05-12 14:32:25 -07:00
archive.h archive: expand only a single %(describe) per archive 2021-03-11 13:22:44 -08:00
attr.c Merge branch 'ab/refs-various-fixes' 2022-03-29 12:22:02 -07:00
attr.h attr.h: remove duplicate struct definition 2022-03-14 05:41:08 +00:00
banned.h C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code 2022-02-21 19:14:19 -08:00
base85.c
…
bisect.c bisect--helper: double-check run command on exit code 126 and 127 2022-01-19 09:35:03 -08:00
bisect.h bisect--helper: double-check run command on exit code 126 and 127 2022-01-19 09:35:03 -08:00
blame.c Merge branch 'ab/diff-free-more' 2022-02-25 15:47:36 -08:00
blame.h
…
blob.c
…
blob.h
…
bloom.c Merge branch 'ah/plugleaks' 2021-05-07 12:47:41 +09:00
bloom.h
…
branch.c Merge branch 'tk/ambiguous-fetch-refspec' 2022-04-04 10:56:24 -07:00
branch.h branch: add --recurse-submodules option for branch creation 2022-02-04 08:16:39 -08:00
builtin.h fsmonitor--daemon: add a built-in fsmonitor daemon 2022-03-25 16:04:15 -07:00
bulk-checkin.c Merge branch 'ns/core-fsyncmethod' 2022-03-25 16:38:24 -07:00
bulk-checkin.h
…
bundle.c bundle: output hash information in 'verify' 2022-03-23 13:14:09 -07:00
bundle.h bundle: parse filter capability 2022-03-09 10:25:27 -08:00
cache-tree.c object-file API: have hash_object_file() take "enum object_type" 2022-02-25 17:16:32 -08:00
cache-tree.h cache-tree: extract subtree_pos() 2021-01-23 17:14:07 -08:00
cache.h Merge branch 'ds/midx-normalize-pathname-before-comparison' into maint 2022-06-08 14:27:53 -07:00
cbtree.c cbtree: remove broken and unused cb_unlink 2021-12-07 15:18:35 -08:00
cbtree.h cbtree: remove broken and unused cb_unlink 2021-12-07 15:18:35 -08:00
chdir-notify.c
…
chdir-notify.h
…
check-builtins.sh
…
checkout.c *.[ch] *_INIT macros: use { 0 } for a "zero out" idiom 2021-09-27 14:47:59 -07:00
checkout.h
…
chunk-format.c csum-file.h: increase hashfile buffer size 2021-05-19 16:41:21 +09:00
chunk-format.h chunk-format: create read chunk API 2021-02-18 13:38:16 -08:00
color.c color: allow colors to be prefixed with "reset" 2021-10-28 09:37:18 -07:00
color.h color: allow colors to be prefixed with "reset" 2021-10-28 09:37:18 -07:00
column.c
…
column.h
…
combine-diff.c Merge branch 'ab/pickaxe-pcre2' 2021-07-13 16:52:50 -07:00
command-list.txt hook: add 'run' subcommand 2022-01-07 15:19:34 -08:00
commit-graph.c commit-graph.c: don't assume that stat() succeeds 2022-05-12 15:42:26 -07:00
commit-graph.h commit-graph: fix memory leak in misused string_list API 2022-03-04 13:24:18 -08:00
commit-reach.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
commit-reach.h commit-graph: return 64-bit generation number 2021-01-18 16:21:18 -08:00
commit-slab-decl.h
…
commit-slab-impl.h
…
commit-slab.h
…
commit.c Merge branch 'ab/racy-hooks' 2022-03-30 18:01:10 -07:00
commit.h shallow: reset commit grafts when shallow is reset 2022-03-17 17:44:38 -07:00
common-main.c Merge branch 'en/keep-cwd' 2022-01-05 14:01:28 -08:00
config.c Merge branch 'jh/builtin-fsmonitor-part2' 2022-04-04 10:56:24 -07:00
config.h fsmonitor: config settings are repository-specific 2022-03-25 16:04:15 -07:00
config.mak.dev config.mak.dev: alternative workaround to gcc 12 warning in http.c 2022-04-15 16:27:04 -07:00
config.mak.in
…
config.mak.uname Merge branch 'jh/builtin-fsmonitor-part2' 2022-04-04 10:56:24 -07:00
configure.ac configure.ac: fix HAVE_SYNC_FILE_RANGE definition 2022-04-06 09:36:19 -07:00
connect.c ls-remote & transport API: release "struct transport_ls_refs_options" 2022-02-06 18:02:34 -08:00
connect.h
…
connected.c run-command API: remove "env" member, always use "env_array" 2021-11-25 22:15:08 -08:00
connected.h connected: refactor iterator to return next object ID directly 2021-09-01 12:43:56 -07:00
convert.c Merge branch 'ab/object-file-api-updates' 2022-03-16 17:53:08 -07:00
convert.h Merge branch 'ds/sparse-index-protections' 2021-04-30 13:50:26 +09:00
copy.c
…
credential.c urlmatch.c: add and use a *_release() function 2022-03-04 13:24:18 -08:00
credential.h *.h: move some *_INIT to designated initializers 2021-07-01 12:31:45 -07:00
csum-file.c core.fsync: introduce granular fsync control infrastructure 2022-03-10 15:10:22 -08:00
csum-file.h core.fsync: introduce granular fsync control infrastructure 2022-03-10 15:10:22 -08:00
ctype.c
…
daemon.c Merge branch 'rs/daemon-plug-leak' 2022-01-05 14:01:31 -08:00
date.c date API: add and use a date_mode_release() 2022-02-16 09:40:00 -08:00
date.h date API: add and use a date_mode_release() 2022-02-16 09:40:00 -08:00
decorate.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
decorate.h
…
delta-islands.c
…
delta-islands.h
…
delta.h odb: guard against data loss checking out a huge file 2021-11-03 11:22:27 -07:00
detect-compiler detect-compiler: make detection independent of locale 2022-05-09 08:52:26 -07:00
diff-delta.c
…
diff-lib.c Merge branch 'dd/diff-files-unmerged-fix' into maint 2021-10-12 13:51:40 -07:00
diff-merges.c Merge branch 'ja/i18n-common-messages' 2022-02-25 15:47:35 -08:00
diff-merges.h diff-index: restore -c/--cc options handling 2021-09-07 11:11:35 -07:00
diff-no-index.c dir: introduce readdir_skip_dot_and_dotdot() helper 2021-05-27 14:02:37 +09:00
diff.c Merge branch 'ab/plug-random-leaks' 2022-03-23 14:09:31 -07:00
diff.h Merge branch 'js/diff-filter-negation-fix' 2022-02-16 15:14:30 -08:00
diffcore-break.c
…
diffcore-delta.c diffcore-delta.c: LLP64 compatibility, upcast unity for left shift 2021-12-01 14:48:10 -08:00
diffcore-order.c
…
diffcore-pickaxe.c xdiff-interface: replace discard_hunk_line() with a flag 2021-05-11 12:47:31 +09:00
diffcore-rename.c object-file API: have hash_object_file() take "enum object_type" 2022-02-25 17:16:32 -08:00
diffcore-rotate.c diff: --{rotate,skip}-to=<path> 2021-02-16 09:30:42 -08:00
diffcore.h merge-ort: store filepairs and filespecs in our mem_pool 2021-07-30 09:01:19 -07:00
dir-iterator.c
…
dir-iterator.h
…
dir.c Merge branch 'js/ci-gcc-12-fixes' into maint 2022-06-08 14:27:50 -07:00
dir.h dir: new flag to remove_dir_recurse() to spare the original_cwd 2021-12-09 13:33:13 -08:00
editor.c run-command API: remove "env" member, always use "env_array" 2021-11-25 22:15:08 -08:00
entry.c Merge branch 'mc/clean-smudge-with-llp64' 2021-11-29 15:41:51 -08:00
entry.h Merge branch 'mc/clean-smudge-with-llp64' 2021-11-29 15:41:51 -08:00
environment.c Merge branch 'ds/midx-normalize-pathname-before-comparison' into maint 2022-06-08 14:27:53 -07:00
environment.h environment: make `getenv_safe()` a public function 2021-01-15 13:03:45 -08:00
exec-cmd.c
…
exec-cmd.h
…
fetch-negotiator.c fetch-negotiator: add specific noop initializer 2022-03-28 10:25:52 -07:00
fetch-negotiator.h fetch-negotiator: add specific noop initializer 2022-03-28 10:25:52 -07:00
fetch-pack.c fetch-pack: add refetch 2022-03-28 10:25:52 -07:00
fetch-pack.h fetch-pack: add refetch 2022-03-28 10:25:52 -07:00
fmt-merge-msg.c Merge branch 'fs/ssh-signing-key-lifetime' 2022-01-12 15:11:41 -08:00
fmt-merge-msg.h merge: allow to pretend a merge is made into a different branch 2021-12-20 14:55:02 -08:00
fsck.c fsck: warn about symlinked dotfiles we'll open with O_NOFOLLOW 2021-05-04 11:52:02 +09:00
fsck.h fsck: warn about symlinked dotfiles we'll open with O_NOFOLLOW 2021-05-04 11:52:02 +09:00
fsmonitor--daemon.h fsmonitor--daemon: use a cookie file to sync with file system 2022-03-25 16:04:17 -07:00
fsmonitor-ipc.c fsmonitor-ipc: create client routines for git-fsmonitor--daemon 2022-03-25 16:04:15 -07:00
fsmonitor-ipc.h fsmonitor-ipc: create client routines for git-fsmonitor--daemon 2022-03-25 16:04:15 -07:00
fsmonitor-settings.c fsmonitor: config settings are repository-specific 2022-03-25 16:04:15 -07:00
fsmonitor-settings.h fsmonitor: config settings are repository-specific 2022-03-25 16:04:15 -07:00
fsmonitor.c fsmonitor: force update index after large responses 2022-03-25 16:04:17 -07:00
fsmonitor.h fsmonitor: config settings are repository-specific 2022-03-25 16:04:15 -07:00
fuzz-commit-graph.c
…
fuzz-pack-headers.c
…
fuzz-pack-idx.c
…
generate-cmdlist.sh generate-cmdlist.sh: don't parse command-list.txt thrice 2021-11-05 12:01:13 -07:00
generate-configlist.sh
…
generate-hooklist.sh hook-list.h: add a generated list of hooks, like config-list.h 2021-09-27 09:44:54 -07:00
gettext.c *.c static functions: add missing __attribute__((format)) 2021-07-13 15:20:20 -07:00
gettext.h gettext: remove optional non-standard parens in N_() definition 2021-09-03 11:40:30 -07:00
git-add--interactive.perl add -p: avoid use of undefined $key when ReadKey -> EOF 2021-11-28 15:14:09 -08:00
git-archimport.perl
…
git-bisect.sh Merge branch 'mr/bisect-in-c-4' 2021-09-23 13:44:48 -07:00
git-compat-util.h Git 2.35.2 2022-04-11 16:44:45 -07:00
git-curl-compat.h http: check CURLE_SSL_PINNEDPUBKEYNOTMATCH when emitting errors 2021-09-27 10:58:07 -07:00
git-cvsexportcommit.perl
…
git-cvsimport.perl
…
git-cvsserver.perl tests: disable fsync everywhere 2021-10-29 10:22:40 -07:00
git-difftool--helper.sh mergetool: break setup_tool out into separate initialization function 2021-02-09 14:09:16 -08:00
git-filter-branch.sh git-sh-setup: remove "sane_grep", it's not needed anymore 2021-10-21 16:17:57 -07:00
git-instaweb.sh git-sh-setup: remove "sane_grep", it's not needed anymore 2021-10-21 16:17:57 -07:00
git-merge-octopus.sh
…
git-merge-one-file.sh
…
git-merge-resolve.sh
…
git-mergetool--lib.sh Merge branch 'sh/mergetool-hideresolved' 2021-02-17 17:21:41 -08:00
git-mergetool.sh mergetool: do not enable hideResolved by default 2021-03-13 15:30:29 -08:00
git-p4.py Merge branch 'ab/config-based-hooks-2' 2022-02-09 14:21:00 -08:00
git-quiltimport.sh
…
git-request-pull.sh
…
git-send-email.perl i18n: fix some badly formatted i18n strings 2022-04-11 14:13:46 -07:00
git-sh-i18n.sh git-sh-i18n: remove unused eval_ngettext() 2021-10-21 16:04:29 -07:00
git-sh-setup.sh git-sh-setup: remove remnant bits referring to `git-legacy-stash` 2022-01-27 18:00:09 -08:00
git-submodule.sh submodule: move core cmd_update() logic to C 2022-03-16 15:07:43 -07:00
git-svn.perl git-svn: drop support for `--preserve-merges` 2021-09-07 21:45:33 -07:00
git-web--browse.sh
…
git.c fsmonitor--daemon: add a built-in fsmonitor daemon 2022-03-25 16:04:15 -07:00
git.rc
…
gpg-interface.c Merge branch 'fs/gpgsm-update' 2022-03-13 22:56:17 +00:00
gpg-interface.h ssh signing: make verify-commit consider key lifetime 2021-12-09 13:38:04 -08:00
graph.c log: fix memory leak if --graph is passed multiple times 2022-02-11 10:06:40 -08:00
graph.h log: fix memory leak if --graph is passed multiple times 2022-02-11 10:06:40 -08:00
grep.c Merge branch 'rs/pcre-invalid-utf8-fix-fix' 2022-02-25 15:47:38 -08:00
grep.h grep: simplify config parsing and option parsing 2022-02-15 18:00:50 -08:00
hash-lookup.c oid_pos(): access table through const pointers 2021-01-28 12:03:26 -08:00
hash-lookup.h oid_pos(): access table through const pointers 2021-01-28 12:03:26 -08:00
hash.h hash.h: provide constants for the hash IDs 2021-09-07 10:47:43 -07:00
hashmap.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
hashmap.h
…
help.c Merge branch 'jh/builtin-fsmonitor-part2' 2022-04-04 10:56:24 -07:00
help.h help: add --no-[external-commands|aliases] for use with --all 2022-02-23 13:41:37 -08:00
hex.c hex: print objects using the hash algorithm member 2021-04-27 16:31:39 +09:00
hook.c hooks: fix an obscure TOCTOU "did we just run a hook?" race 2022-03-07 13:00:53 -08:00
hook.h hooks: fix an obscure TOCTOU "did we just run a hook?" race 2022-03-07 13:00:53 -08:00
http-backend.c date API: create a date.h, split from cache.h 2022-02-16 09:40:00 -08:00
http-fetch.c i18n: factorize "--foo requires --bar" and the like 2022-01-05 13:31:00 -08:00
http-push.c object-file API: add a format_object_header() function 2022-02-25 17:16:31 -08:00
http-walker.c http: rename CURLOPT_FILE to CURLOPT_WRITEDATA 2021-07-30 16:01:54 -07:00
http.c http.c: clear the 'finished' member once we are done with it 2022-05-27 15:58:31 -07:00
http.h http: check CURLE_SSL_PINNEDPUBKEYNOTMATCH when emitting errors 2021-09-27 10:58:07 -07:00
ident.c date API: create a date.h, split from cache.h 2022-02-16 09:40:00 -08:00
imap-send.c Merge branch 'bc/csprng-mktemps' 2022-04-06 15:21:59 -07:00
iterator.h
…
json-writer.c *.c *_init(): define in terms of corresponding *_INIT macro 2021-07-01 12:32:22 -07:00
json-writer.h *.h: move some *_INIT to designated initializers 2021-07-01 12:31:45 -07:00
khash.h khash: clarify that allocations never fail 2021-07-06 13:07:50 -07:00
kwset.c
…
kwset.h
…
levenshtein.c
…
levenshtein.h
…
line-log.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
line-log.h
…
line-range.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
line-range.h
…
linear-assignment.c
…
linear-assignment.h
…
list-objects-filter-options.c pack-objects: lazily set up "struct rev_info", don't leak 2022-03-28 09:57:21 -07:00
list-objects-filter-options.h pack-objects: lazily set up "struct rev_info", don't leak 2022-03-28 09:57:21 -07:00
list-objects-filter.c list-objects: implement object type filter 2021-04-19 14:09:11 -07:00
list-objects-filter.h list-objects: support filtering by tag and commit 2021-04-12 09:35:50 -07:00
list-objects.c list-objects: handle NULL function pointers 2022-03-09 10:25:27 -08:00
list-objects.h list-objects: consolidate traverse_commit_list[_filtered] 2022-03-09 10:25:27 -08:00
list.h *.h: move some *_INIT to designated initializers 2021-09-27 14:48:00 -07:00
ll-merge.c ll-merge: make callers responsible for showing warnings 2022-02-02 10:02:27 -08:00
ll-merge.h ll-merge: make callers responsible for showing warnings 2022-02-02 10:02:27 -08:00
lockfile.c
…
lockfile.h *.[ch] *_INIT macros: use { 0 } for a "zero out" idiom 2021-09-27 14:47:59 -07:00
log-tree.c Merge branch 'jc/diff-tree-stdin-fix' into maint 2022-05-05 14:36:24 -07:00
log-tree.h log-tree.h: remove unused function declarations 2021-10-01 14:39:46 -07:00
ls-refs.c i18n: factorize "invalid value" messages 2022-02-04 13:58:28 -08:00
ls-refs.h serve.[ch]: don't pass "struct strvec *keys" to commands 2021-08-05 08:59:37 -07:00
mailinfo.c Merge branch 'ar/mailinfo-memcmp-to-skip-prefix' 2021-07-08 13:15:03 -07:00
mailinfo.h am: learn to process quoted lines that ends with CRLF 2021-05-10 15:06:22 +09:00
mailmap.c string-list API: change "nr" and "alloc" to "size_t" 2022-03-07 12:02:04 -08:00
mailmap.h shortlog: remove unused(?) "repo-abbrev" feature 2021-01-12 14:04:42 -08:00
match-trees.c object-file API: have write_object_file() take "enum object_type" 2022-02-25 17:16:31 -08:00
mem-pool.c mem-pool: don't assume uintmax_t is aligned enough for all types 2022-01-24 10:26:40 -08:00
mem-pool.h
…
merge-blobs.c ll-merge: make callers responsible for showing warnings 2022-02-02 10:02:27 -08:00
merge-blobs.h
…
merge-ort-wrappers.c merge(s): apply consistent punctuation to "up to date" messages 2021-05-03 14:14:56 +09:00
merge-ort-wrappers.h
…
merge-ort.c Merge branch 'ab/string-list-count-in-size-t' 2022-03-16 17:53:09 -07:00
merge-ort.h show, log: include conflict/warning messages in --remerge-diff headers 2022-02-02 10:02:28 -08:00
merge-recursive.c Merge branch 'ab/object-file-api-updates' 2022-03-16 17:53:08 -07:00
merge-recursive.h merge-ort: format messages slightly different for use in headers 2022-02-02 10:02:27 -08:00
merge.c unpack-trees: introduce preserve_ignored to unpack_trees_options 2021-09-27 13:38:37 -07:00
mergesort.c mergesort: avoid left shift overflow 2021-11-18 12:42:06 -08:00
mergesort.h
…
midx.c Merge branch 'ds/midx-normalize-pathname-before-comparison' into maint 2022-06-08 14:27:53 -07:00
midx.h midx: read `RIDX` chunk when present 2022-01-27 12:07:53 -08:00
name-hash.c Merge branch 'ds/sparse-index-protections' 2021-04-30 13:50:26 +09:00
notes-cache.c object-file API: have write_object_file() take "enum object_type" 2022-02-25 17:16:31 -08:00
notes-cache.h
…
notes-merge.c misc *.c: use designated initializers for struct assignments 2022-03-17 10:36:42 -07:00
notes-merge.h
…
notes-utils.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
notes-utils.h
…
notes.c object-file API: have write_object_file() take "enum object_type" 2022-02-25 17:16:31 -08:00
notes.h
…
object-file.c object-file: fix a unpack_loose_header() regression in 3b6a8db3b0 2022-05-12 15:42:26 -07:00
object-name.c Merge branch 'ab/date-mode-release' 2022-02-25 15:47:36 -08:00
object-store.h object-file API: have hash_object_file() take "enum object_type" 2022-02-25 17:16:32 -08:00
object.c object-file API: have hash_object_file() take "enum object_type" 2022-02-25 17:16:32 -08:00
object.h reflog: libify delete reflog function and helpers 2022-03-02 15:24:47 -08:00
oid-array.c oid_pos(): access table through const pointers 2021-01-28 12:03:26 -08:00
oid-array.h *.[ch] *_INIT macros: use { 0 } for a "zero out" idiom 2021-09-27 14:47:59 -07:00
oidmap.c
…
oidmap.h
…
oidset.c oidset: make oidset_size() an inline function 2021-09-12 16:14:32 -07:00
oidset.h oidset: make oidset_size() an inline function 2021-09-12 16:14:32 -07:00
oidtree.c oidtree: avoid unaligned access to crit-bit tree 2021-08-15 13:13:50 -07:00
oidtree.h oidtree: a crit-bit tree for odb_loose_cache 2021-07-07 21:28:04 -07:00
pack-bitmap-write.c core.fsync: introduce granular fsync control infrastructure 2022-03-10 15:10:22 -08:00
pack-bitmap.c list-objects: consolidate traverse_commit_list[_filtered] 2022-03-09 10:25:27 -08:00
pack-bitmap.h pack-bitmap: drop filter in prepare_bitmap_walk() 2022-03-09 10:25:27 -08:00
pack-check.c object-file API: have hash_object_file() take "enum object_type" 2022-02-25 17:16:32 -08:00
pack-objects.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
pack-objects.h pack-objects: move static inline from a header to the sole consumer 2021-05-27 12:14:41 +09:00
pack-revindex.c midx: read `RIDX` chunk when present 2022-01-27 12:07:53 -08:00
pack-revindex.h pack-revindex.h: correct the time complexity descriptions 2021-09-15 22:16:25 -07:00
pack-write.c core.fsync: introduce granular fsync control infrastructure 2022-03-10 15:10:22 -08:00
pack.h pack-write: split up finish_tmp_packfile() function 2021-09-09 18:23:11 -07:00
packfile.c Merge branch 'jt/pack-header-lshift-overflow' 2022-01-12 15:11:41 -08:00
packfile.h Merge branch 'tb/pack-revindex-on-disk-cleanup' 2021-12-15 09:39:50 -08:00
pager.c pager: fix crash when pager program doesn't exist 2021-11-24 16:14:10 -08:00
parallel-checkout.c i18n: factorize "invalid value" messages 2022-02-04 13:58:28 -08:00
parallel-checkout.h parallel-checkout: support progress displaying 2021-04-19 11:57:05 -07:00
parse-options-cb.c branch: add flags and config to inherit tracking 2021-12-20 22:40:21 -08:00
parse-options.c Merge branch 'ja/i18n-common-messages' 2022-02-25 15:47:35 -08:00
parse-options.h Merge branch 'ja/i18n-common-messages' 2022-02-25 15:47:35 -08:00
patch-delta.c
…
patch-ids.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
patch-ids.h patch-ids: handle duplicate hashmap entries 2021-01-12 11:13:32 -08:00
path.c Sync with 2.33.2 2022-03-24 00:31:36 +01:00
path.h repository.c: free the "path cache" in repo_clear() 2022-03-04 13:24:19 -08:00
pathspec.c add: skip tracked paths outside sparse-checkout cone 2021-09-28 10:31:02 -07:00
pathspec.h pathspec: use BUG(...) not die("BUG:%s:%d....", <file>, <line>) 2021-12-07 12:31:17 -08:00
pkt-line.c fetch-pack: redact packfile urls in traces 2021-11-11 10:07:43 -08:00
pkt-line.h fetch-pack: redact packfile urls in traces 2021-11-11 10:07:43 -08:00
preload-index.c preload-index: log the number of lstat calls to trace2 2021-02-16 17:14:34 -08:00
pretty.c Merge branch 'es/pretty-describe-more' 2021-12-15 09:39:48 -08:00
pretty.h date API: create a date.h, split from cache.h 2022-02-16 09:40:00 -08:00
prio-queue.c
…
prio-queue.h
…
progress.c progress API: unify stop_progress{,_msg}(), fix trace2 bug 2022-02-03 15:39:59 -08:00
progress.h progress API: unify stop_progress{,_msg}(), fix trace2 bug 2022-02-03 15:39:59 -08:00
promisor-remote.c Merge branch 'jt/partial-clone-submodule-1' 2021-07-16 17:42:53 -07:00
promisor-remote.h promisor-remote: support per-repository config 2021-06-28 09:57:42 -07:00
prompt.c run-command API users: use strvec_push(), not argv construction 2021-11-25 22:15:07 -08:00
prompt.h
…
protocol-caps.c Merge branch 'ab/serve-cleanup' 2021-09-20 15:20:43 -07:00
protocol-caps.h serve.[ch]: don't pass "struct strvec *keys" to commands 2021-08-05 08:59:37 -07:00
protocol.c connect, protocol: log negotiated protocol version 2021-08-10 11:46:33 -07:00
protocol.h
…
prune-packed.c
…
prune-packed.h
…
quote.c ref-filter: --format=%(raw) support --perl 2021-07-26 12:01:25 -07:00
quote.h Merge branch 'zh/ref-filter-raw-data' 2021-08-24 15:32:37 -07:00
range-diff.c range-diff: plug memory leak in read_patches() 2022-03-04 13:24:19 -08:00
range-diff.h Merge branch 'js/range-diff-one-side-only' 2021-02-17 17:21:41 -08:00
reachable.c pack-bitmap: drop filter in prepare_bitmap_walk() 2022-03-09 10:25:27 -08:00
reachable.h
…
read-cache.c Merge branch 'vd/mv-refresh-stat' 2022-04-04 10:56:24 -07:00
rebase-interactive.c rebase: remove a no-longer-used function 2021-09-07 21:45:33 -07:00
rebase-interactive.h rebase: remove a no-longer-used function 2021-09-07 21:45:33 -07:00
rebase.c pull: remove support for `--rebase=preserve` 2021-09-07 21:45:32 -07:00
rebase.h pull: remove support for `--rebase=preserve` 2021-09-07 21:45:32 -07:00
ref-filter.c date API: add and use a date_mode_release() 2022-02-16 09:40:00 -08:00
ref-filter.h for-each-ref: delay parsing of --sort=<atom> options 2021-10-20 14:33:07 -07:00
reflog-walk.c refs: make repo_dwim_log() accept a NULL oid 2021-08-25 13:27:37 -07:00
reflog-walk.h date API: create a date.h, split from cache.h 2022-02-16 09:40:00 -08:00
reflog.c Merge branch 'ab/reflog-parse-options' 2022-04-04 10:56:21 -07:00
reflog.h reflog: libify delete reflog function and helpers 2022-03-02 15:24:47 -08:00
refs.c Revert "Merge branch 'ps/avoid-unnecessary-hook-invocation-with-packed-refs'" 2022-04-13 15:51:33 -07:00
refs.h Revert "Merge branch 'ps/avoid-unnecessary-hook-invocation-with-packed-refs'" 2022-04-13 15:51:33 -07:00
refspec.c refspec.c: use designated initializers for "struct refspec_item" 2022-02-24 15:59:53 -08:00
refspec.h
…
remote-curl.c Merge branch 'rc/fetch-refetch' 2022-04-04 10:56:23 -07:00
remote.c remote: read symbolic refs via `refs_read_symbolic_ref()` 2022-03-01 10:13:46 -08:00
remote.h remote: die if branch is not found in repository 2021-11-18 22:31:19 -08:00
replace-object.c
…
replace-object.h
…
repo-settings.c compat/fsmonitor/fsm-listen-win32: stub in backend for Windows 2022-03-25 16:04:15 -07:00
repository.c Merge branch 'ab/plug-random-leaks' 2022-03-13 22:56:18 +00:00
repository.h Merge branch 'jh/builtin-fsmonitor-part2' 2022-04-04 10:56:24 -07:00
rerere.c ll-merge: make callers responsible for showing warnings 2022-02-02 10:02:27 -08:00
rerere.h
…
reset.c Merge branch 'pw/use-in-process-checkout-in-rebase' 2022-02-18 13:53:27 -08:00
reset.h rebase --apply: set ORIG_HEAD correctly 2022-01-26 12:08:53 -08:00
resolve-undo.c Merge branch 'ds/sparse-index-protections' 2021-04-30 13:50:26 +09:00
resolve-undo.h
…
revision.c list-objects-filter: remove CL_ARG__FILTER 2022-03-23 13:13:17 -07:00
revision.h revision: put object filter into struct rev_info 2022-03-09 10:25:26 -08:00
run-command.c Merge branch 'ab/config-based-hooks-2' 2022-02-09 14:21:00 -08:00
run-command.h run-command: remove old run_hook_{le,ve}() hook API 2022-01-07 15:19:35 -08:00
send-pack.c Merge branch 'fs/ssh-signing' 2021-10-25 16:06:58 -07:00
send-pack.h
…
sequencer.c Merge branch 'rs/commit-summary-wo-break-rewrite' into maint 2022-06-08 14:27:52 -07:00
sequencer.h create_autostash(): remove unneeded parameter 2022-01-26 12:08:53 -08:00
serve.c serve: reject commands used as capabilities 2021-09-15 12:25:19 -07:00
serve.h serve.[ch]: remove "serve_options", split up --advertise-refs code 2021-08-05 08:59:37 -07:00
server-info.c *.c static functions: add missing __attribute__((format)) 2021-07-13 15:20:20 -07:00
setup.c Git 2.35.3 2022-04-13 15:26:32 -07:00
sh-i18n--envsubst.c builtins + test helpers: use return instead of exit() in cmd_* 2021-06-09 09:15:58 +09:00
sha1dc_git.c
…
sha1dc_git.h
…
shallow.c shallow: reset commit grafts when shallow is reset 2022-03-17 17:44:38 -07:00
shallow.h *.h: move some *_INIT to designated initializers 2021-09-27 14:48:00 -07:00
shared.mak Makefile: use ' ', not non-existing $(wspfx_SQ) 2022-03-21 09:03:45 -07:00
shell.c builtins + test helpers: use return instead of exit() in cmd_* 2021-06-09 09:15:58 +09:00
shortlog.h shortlog: remove unused(?) "repo-abbrev" feature 2021-01-12 14:04:42 -08:00
sideband.c sideband: don't lose clear-to-eol at packet boundary 2021-06-17 14:11:36 +09:00
sideband.h
…
sigchain.c
…
sigchain.h
…
simple-ipc.h Merge branch 'jh/builtin-fsmonitor-part1' 2021-10-13 15:15:58 -07:00
sparse-index.c Merge branch 'en/present-despite-skipped' 2022-03-09 13:38:23 -08:00
sparse-index.h repo_read_index: clear SKIP_WORKTREE bit from files present in worktree 2022-01-14 14:43:22 -08:00
split-index.c split-index: it really is incompatible with the sparse index 2022-01-23 17:06:23 -08:00
split-index.h
…
stable-qsort.c stable-qsort: avoid using potentially unaligned access 2022-01-07 15:48:40 -08:00
strbuf.c gettext API users: don't explicitly cast ngettext()'s "n" 2022-03-07 11:57:52 -08:00
strbuf.h strbuf.h: use BUG(...) not die("BUG: ...") 2021-12-07 12:31:16 -08:00
streaming.c object-file.c: stop dying in parse_loose_header() 2021-10-01 15:06:00 -07:00
streaming.h
…
string-list.c string-list.[ch]: remove string_list_init() compatibility function 2021-09-28 14:43:38 -07:00
string-list.h string-list API: change "nr" and "alloc" to "size_t" 2022-03-07 12:02:04 -08:00
strmap.c *.c *_init(): define in terms of corresponding *_INIT macro 2021-07-01 12:32:22 -07:00
strmap.h
…
strvec.c *.c *_init(): define in terms of corresponding *_INIT macro 2021-07-01 12:32:22 -07:00
strvec.h *.h: move some *_INIT to designated initializers 2021-09-27 14:48:00 -07:00
sub-process.c run-command API: remove "argv" member, always use "args" 2021-11-25 22:15:07 -08:00
sub-process.h
…
submodule-config.c Merge branch 'ja/i18n-common-messages' 2022-02-25 15:47:35 -08:00
submodule-config.h branch: add --recurse-submodules option for branch creation 2022-02-04 08:16:39 -08:00
submodule.c Merge branch 'jt/reset-grafts-when-resetting-shallow' 2022-03-29 12:22:03 -07:00
submodule.h submodule: fix latent check_has_commit() bug 2022-03-16 16:08:59 -07:00
symlinks.c symlinks: do not include startup_info->original_cwd in dir removal 2021-12-09 13:33:13 -08:00
tag.c ssh signing: make verify-tag consider key lifetime 2021-12-09 13:38:04 -08:00
tag.h
…
tar.h
…
tempfile.c
…
tempfile.h
…
thread-utils.c
…
thread-utils.h
…
tmp-objdir.c log: clean unneeded objects during `log --remerge-diff` 2022-02-02 10:02:27 -08:00
tmp-objdir.h log: clean unneeded objects during `log --remerge-diff` 2022-02-02 10:02:27 -08:00
trace.c C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code 2022-02-21 19:14:19 -08:00
trace.h C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code 2022-02-21 19:14:19 -08:00
trace2.c trace2: add stats for fsync operations 2022-03-30 11:15:55 -07:00
trace2.h C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code 2022-02-21 19:14:19 -08:00
trailer.c run-command API: remove "env" member, always use "env_array" 2021-11-25 22:15:08 -08:00
trailer.h
…
transport-helper.c fetch: add --refetch option 2022-03-28 10:25:52 -07:00
transport-internal.h transport: rename "fetch" in transport_vtable to "fetch_refs" 2021-08-05 08:59:36 -07:00
transport.c Merge branch 'rc/fetch-refetch' 2022-04-04 10:56:23 -07:00
transport.h fetch: add --refetch option 2022-03-28 10:25:52 -07:00
tree-diff.c pathspec: use BUG(...) not die("BUG:%s:%d....", <file>, <line>) 2021-12-07 12:31:17 -08:00
tree-walk.c object-file API: pass an enum to read_object_with_reference() 2022-02-25 17:16:32 -08:00
tree-walk.h
…
tree.c tree.h API: simplify read_tree_recursive() signature 2021-03-20 16:09:26 -07:00
tree.h tree.h API: simplify read_tree_recursive() signature 2021-03-20 16:09:26 -07:00
unicode-width.h unicode: update the width tables to Unicode 14 2021-09-17 17:26:21 -07:00
unimplemented.sh
…
unix-socket.c unix-socket: disallow chdir() when creating unix domain sockets 2021-03-15 14:32:51 -07:00
unix-socket.h unix-socket: disallow chdir() when creating unix domain sockets 2021-03-15 14:32:51 -07:00
unix-stream-server.c unix-stream-server: create unix domain socket under lock 2021-03-15 14:32:51 -07:00
unix-stream-server.h unix-stream-server: create unix domain socket under lock 2021-03-15 14:32:51 -07:00
unpack-trees.c Revert "unpack-trees: improve performance of next_cache_entry" 2022-03-17 09:13:21 -07:00
unpack-trees.h unpack-trees: refuse to remove startup_info->original_cwd 2021-12-09 13:33:12 -08:00
upload-pack.c upload-pack: look up "want" lines via commit-graph 2022-03-01 10:13:45 -08:00
upload-pack.h serve.[ch]: remove "serve_options", split up --advertise-refs code 2021-08-05 08:59:37 -07:00
url.c
…
url.h
…
urlmatch.c urlmatch.c: add and use a *_release() function 2022-03-04 13:24:18 -08:00
urlmatch.h urlmatch.c: add and use a *_release() function 2022-03-04 13:24:18 -08:00
usage.c C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code 2022-02-21 19:14:19 -08:00
userdiff.c Merge branch 'jd/userdiff-kotlin' 2022-03-23 14:09:29 -07:00
userdiff.h userdiff: add and use for_each_userdiff_driver() 2021-04-08 12:19:10 -07:00
utf8.c t0060: test ntfs/hfs-obscured dotfiles 2021-05-04 11:52:02 +09:00
utf8.h t0060: test ntfs/hfs-obscured dotfiles 2021-05-04 11:52:02 +09:00
varint.c
…
varint.h
…
version.c
…
version.h
…
versioncmp.c
…
walker.c lookup_unknown_object(): take a repository argument 2021-04-13 13:18:46 -07:00
walker.h
…
wildmatch.c
…
wildmatch.h
…
worktree.c Merge branch 'ds/sparse-checkout-requires-per-worktree-config' 2022-02-25 15:47:33 -08:00
worktree.h worktree: create init_worktree_config() 2022-02-08 09:49:20 -08:00
wrap-for-bin.sh
…
wrapper.c trace2: add stats for fsync operations 2022-03-30 11:15:55 -07:00
write-or-die.c core.fsync: introduce granular fsync control infrastructure 2022-03-10 15:10:22 -08:00
ws.c
…
wt-status.c Merge branch 'ab/string-list-count-in-size-t' 2022-03-16 17:53:09 -07:00
wt-status.h status: skip sparse-checkout percentage with sparse-index 2021-07-14 13:42:49 -07:00
xdiff-interface.c xdiff: implement a zealous diff3, or "zdiff3" 2021-12-01 14:45:58 -08:00
xdiff-interface.h xdiff-interface: replace discard_hunk_line() with a flag 2021-05-11 12:47:31 +09:00
zlib.c
…

README.md

Build status

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-<commandname>.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 and Documentation/CodingGuidelines).

Those wishing to help with error message, usage and informational message string translations (localization l10) should see po/README.md (a po file is a Portable Object file that holds the translations).

To subscribe to the list, send an email with just "subscribe git" in the body to majordomo@vger.kernel.org (not the Git list). The mailing list archives are available at https://lore.kernel.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