Go to file
René Scharfe bfda204ade checkout, restore: make pathspec recursive
The pathspec given to git checkout and git restore is used with both
tree_entry_interesting (via read_tree_recursive) and match_pathspec
(via ce_path_match).  The latter effectively only supports recursive
matching regardless of the value of the pathspec flag "recursive",
which is unset here.

That causes different match results for pathspecs with wildcards, and
can lead checkout and restore in no-overlay mode to remove entries
instead of modifying them.  Enable recursive matching for both checkout
and restore to make matching consistent.

Setting the flag in checkout_main() technically also affects git switch,
but since that command doesn't accept pathspecs at all this has no
actual consequence.

Reported-by: Sergii Shkarnikov <sergii.shkarnikov@globallogic.com>
Initial-test-by: Sergii Shkarnikov <sergii.shkarnikov@globallogic.com>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-08-22 13:37:43 -07:00
.github
Documentation Merge branch 'am/pathspec-f-f-checkout' 2019-12-25 11:21:57 -08:00
block-sha1
builtin checkout, restore: make pathspec recursive 2020-08-22 13:37:43 -07:00
ci Merge branch 'sg/osx-force-gcc-9' 2019-12-06 15:09:21 -08:00
compat Merge branch 'dd/time-reentrancy' 2019-12-16 13:08:31 -08:00
contrib Merge branch 'dl/pretty-reference' 2019-12-10 13:11:43 -08:00
ewah
git-gui
gitk-git
gitweb Merge branch 'jk/gitweb-anti-xss' 2019-12-01 09:04:41 -08:00
mergetools
negotiator
perl
po
ppc
refs
sha1collisiondetection@855827c583
sha1dc Merge branch 'jk/lore-is-the-archive' 2019-12-06 15:09:23 -08:00
sha256
t checkout, restore: make pathspec recursive 2020-08-22 13:37:43 -07:00
templates Merge branch 'kw/fsmonitor-watchman-fix' 2019-12-01 09:04:33 -08:00
trace2 Merge branch 'en/doc-typofix' 2019-12-01 09:04:35 -08:00
vcs-svn
xdiff Merge branch 'rs/xdiff-ignore-ws-w-func-context' 2019-12-16 13:08:32 -08:00
.clang-format
.editorconfig
.gitattributes
.gitignore
.gitmodules
.mailmap
.travis.yml
.tsan-suppressions
CODE_OF_CONDUCT.md
COPYING
GIT-VERSION-GEN Git 2.24.1 2019-12-06 16:31:40 +01:00
INSTALL Merge branch 'ar/install-doc-update-cmds-needing-the-shell' 2019-12-01 09:04:41 -08:00
LGPL-2.1
Makefile fix-typo: consecutive-word duplications 2019-12-16 11:53:11 -08:00
README.md doc: recommend lore.kernel.org over public-inbox.org 2019-11-30 09:12:04 -08:00
RelNotes Git 2.24.1 2019-12-06 16:31:40 +01:00
abspath.c
aclocal.m4
add-interactive.c built-in add -i: offer the `quit` command 2019-12-01 07:30:54 -08:00
add-interactive.h
advice.c submodule--helper: advise on fatal alternate error 2019-12-03 08:49:45 -08:00
advice.h submodule--helper: advise on fatal alternate error 2019-12-03 08:49:45 -08:00
alias.c
alias.h
alloc.c
alloc.h
apply.c Merge branch 'js/add-i-a-bit-more-tests' 2019-12-16 13:08:47 -08:00
apply.h
archive-tar.c
archive-zip.c Merge branch 'rs/archive-zip-code-cleanup' 2019-12-16 13:14:47 -08:00
archive.c
archive.h
argv-array.c
argv-array.h
attr.c
attr.h
azure-pipelines.yml
banned.h
base85.c
bisect.c
bisect.h
blame.c
blame.h
blob.c
blob.h
branch.c
branch.h
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'hw/doc-in-header' 2019-12-16 13:08:39 -08:00
chdir-notify.c
chdir-notify.h
check-builtins.sh
check_bindir
checkout.c
checkout.h
color.c
color.h
column.c
column.h
combine-diff.c
command-list.txt
commit-graph.c Merge branch 'ds/commit-graph-delay-gen-progress' 2019-12-10 13:11:43 -08:00
commit-graph.h
commit-reach.c
commit-reach.h
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c Merge branch 'jk/cleanup-object-parsing-and-fsck' 2019-12-01 09:04:28 -08:00
commit.h
common-main.c
config.c
config.h
config.mak.dev
config.mak.in
config.mak.uname Sync with 2.23.1 2019-12-06 16:31:39 +01:00
configure.ac Merge branch 'dd/sequencer-utf8' 2019-12-01 09:04:36 -08:00
connect.c Sync with 2.23.1 2019-12-06 16:31:39 +01:00
connect.h
connected.c
connected.h
convert.c Merge branch 'rs/skip-iprefix' 2019-12-01 09:04:36 -08:00
convert.h
copy.c
credential-cache--daemon.c
credential-cache.c
credential-store.c
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c date.c: switch to reentrant {gm,local}time_r 2019-11-30 13:50:48 -08:00
decorate.c
decorate.h
delta-islands.c
delta-islands.h
delta.h
detect-compiler
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c Merge branch 'js/builtin-add-i' 2019-12-05 12:52:43 -08:00
diff.h Merge branch 'hw/doc-in-header' 2019-12-16 13:08:39 -08:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c Merge branch 'hw/doc-in-header' 2019-12-16 13:08:39 -08:00
dir.h
editor.c
entry.c
environment.c Sync with 2.23.1 2019-12-06 16:31:39 +01:00
exec-cmd.c
exec-cmd.h
fast-import.c Sync with 2.23.1 2019-12-06 16:31:39 +01:00
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c Merge branch 'ec/fetch-mark-common-refs-trace2' 2019-12-05 12:52:44 -08:00
fetch-pack.h
fmt-merge-msg.h
fsck.c Sync with Git 2.24.1 2019-12-09 22:17:55 -08:00
fsck.h
fsmonitor.c unpack-trees: skip stat on fsmonitor-valid files 2019-11-21 12:48:18 +09:00
fsmonitor.h
fuzz-commit-graph.c
fuzz-pack-headers.c
fuzz-pack-idx.c
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl git add -p: use non-zero exit code when the diff generation failed 2019-12-06 08:57:34 -08:00
git-archimport.perl
git-bisect.sh
git-compat-util.h Sync with Git 2.24.1 2019-12-09 22:17:55 -08:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-filter-branch.sh
git-instaweb.sh
git-legacy-stash.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-p4.py
git-parse-remote.sh
git-quiltimport.sh
git-rebase--preserve-merges.sh
git-request-pull.sh
git-send-email.perl
git-sh-i18n.sh
git-sh-setup.sh
git-submodule.sh Merge branch 'dl/submodule-set-url' 2019-12-10 13:11:42 -08:00
git-svn.perl git svn: stop using `rebase --preserve-merges` 2019-11-23 09:49:23 +09:00
git-web--browse.sh
git.c
git.rc
gpg-interface.c gpg-interface: prefer check_signature() for GPG verification 2019-11-30 13:52:35 -08:00
gpg-interface.h gpg-interface: prefer check_signature() for GPG verification 2019-11-30 13:52:35 -08:00
graph.c Merge branch 'hw/doc-in-header' 2019-12-16 13:08:39 -08:00
graph.h
grep.c grep: don't return an expression from pcre2_free() 2019-11-30 14:06:58 -08:00
grep.h
hash.h
hashmap.c
hashmap.h Merge branch 'en/doc-typofix' 2019-12-01 09:04:35 -08:00
help.c
help.h
hex.c
http-backend.c
http-fetch.c
http-push.c
http-walker.c
http.c Merge branch 'cb/curl-use-xmalloc' 2019-12-01 09:04:33 -08:00
http.h
ident.c
imap-send.c
interdiff.c
interdiff.h
iterator.h
json-writer.c
json-writer.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c
line-log.h
line-range.c
line-range.h
linear-assignment.c
linear-assignment.h
list-objects-filter-options.c
list-objects-filter-options.h
list-objects-filter.c
list-objects-filter.h
list-objects.c
list-objects.h
list.h
ll-merge.c
ll-merge.h
lockfile.c
lockfile.h
log-tree.c Merge branch 'hi/gpg-use-check-signature' 2019-12-10 13:11:45 -08:00
log-tree.h
ls-refs.c
ls-refs.h
mailinfo.c
mailinfo.h
mailmap.c
mailmap.h
match-trees.c
mem-pool.c
mem-pool.h
merge-blobs.c
merge-blobs.h
merge-recursive.c
merge-recursive.h
merge.c
mergesort.c
mergesort.h
midx.c
midx.h
name-hash.c Merge branch 'en/doc-typofix' 2019-12-01 09:04:35 -08:00
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes-utils.c
notes-utils.h
notes.c
notes.h
object-store.h packfile.c: speed up loading lots of packfiles 2019-12-03 07:59:45 -08:00
object.c packfile.c: speed up loading lots of packfiles 2019-12-03 07:59:45 -08:00
object.h
oidmap.c
oidmap.h
oidset.c
oidset.h
pack-bitmap-write.c
pack-bitmap.c
pack-bitmap.h
pack-check.c
pack-objects.c Merge branch 'jk/optim-in-pack-idx-conversion' 2019-12-01 09:04:38 -08:00
pack-objects.h Merge branch 'jk/optim-in-pack-idx-conversion' 2019-12-01 09:04:38 -08:00
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
packfile.c packfile.c: speed up loading lots of packfiles 2019-12-03 07:59:45 -08:00
packfile.h
pager.c
parse-options-cb.c
parse-options.c
parse-options.h Merge branch 'hw/doc-in-header' 2019-12-16 13:08:39 -08:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c Sync with Git 2.24.1 2019-12-09 22:17:55 -08:00
path.h
pathspec.c
pathspec.h Merge branch 'hw/doc-in-header' 2019-12-16 13:08:39 -08:00
pkt-line.c
pkt-line.h pkt-line: fix a typo 2019-12-02 08:48:56 -08:00
preload-index.c
pretty.c Merge branch 'dl/pretty-reference' 2019-12-10 13:11:43 -08:00
pretty.h
prio-queue.c
prio-queue.h
progress.c progress: create GIT_PROGRESS_DELAY 2019-11-27 10:57:10 +09:00
progress.h
promisor-remote.c
promisor-remote.h
prompt.c
prompt.h
protocol.c
protocol.h
quote.c
quote.h
range-diff.c range-diff: mark pointers as const 2019-12-06 12:34:49 -08:00
range-diff.h Merge branch 'dl/range-diff-with-notes' 2019-12-16 13:08:46 -08:00
reachable.c
reachable.h
read-cache.c Sync with Git 2.24.1 2019-12-09 22:17:55 -08:00
rebase-interactive.c
rebase-interactive.h
ref-filter.c
ref-filter.h
reflog-walk.c
reflog-walk.h
refs.c
refs.h
refspec.c
refspec.h
remote-curl.c
remote-testsvn.c
remote.c
remote.h
replace-object.c
replace-object.h
repo-settings.c
repository.c
repository.h
rerere.c
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'dl/pretty-reference' 2019-12-10 13:11:43 -08:00
revision.h Merge branch 'hw/doc-in-header' 2019-12-16 13:08:39 -08:00
run-command.c run-command: use prepare_git_cmd() in prepare_cmd() 2019-11-27 11:22:35 +09:00
run-command.h
send-pack.c Merge branch 'jk/send-pack-check-negative-with-quick' 2019-12-06 15:09:22 -08:00
send-pack.h
sequencer.c Merge branch 'ag/sequencer-todo-updates' 2019-12-16 13:08:31 -08:00
sequencer.h Merge branch 'ra/rebase-i-more-options' 2019-12-10 13:11:41 -08:00
serve.c
serve.h
server-info.c
setup.c
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-file.c
sha1-lookup.c
sha1-lookup.h
sha1-name.c
sha1dc_git.c
sha1dc_git.h
shallow.c
shell.c shell: use skip_prefix() instead of starts_with() 2019-11-27 11:18:24 +09:00
shortlog.h
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c
split-index.h
stable-qsort.c
strbuf.c
strbuf.h
streaming.c
streaming.h
string-list.c
string-list.h
sub-process.c
sub-process.h
submodule-config.c fix-typo: consecutive-word duplications 2019-12-16 11:53:11 -08:00
submodule-config.h
submodule.c Sync with 2.22.2 2019-12-06 16:31:30 +01:00
submodule.h Sync with 2.22.2 2019-12-06 16:31:30 +01:00
symlinks.c
tag.c
tag.h
tar.h
tempfile.c
tempfile.h
thread-utils.c
thread-utils.h
tmp-objdir.c
tmp-objdir.h
trace.c
trace.h
trace2.c
trace2.h
trailer.c
trailer.h
transport-helper.c Sync with 2.23.1 2019-12-06 16:31:39 +01:00
transport-internal.h
transport.c
transport.h
tree-diff.c
tree-walk.c Sync with Git 2.24.1 2019-12-09 22:17:55 -08:00
tree-walk.h
tree.c
tree.h
unicode-width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Sync with Git 2.24.1 2019-12-09 22:17:55 -08:00
unpack-trees.h
upload-pack.c
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c Merge branch 'jh/userdiff-python-async' 2019-12-05 12:52:44 -08:00
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c
walker.h
wildmatch.c
wildmatch.h
worktree.c
worktree.h
wrap-for-bin.sh
wrapper.c
write-or-die.c
ws.c
wt-status.c
wt-status.h
xdiff-interface.c
xdiff-interface.h
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). 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://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