Go to file

Elijah Newren b34ab4a43b stash: remove unnecessary process forking When stash was converted from shell to a builtin, it merely transliterated the forking of various git commands from shell to a C program that would fork the same commands. Some of those were converted over to actual library calls, but much of the pipeline-of-commands design still remains. Fix some of this by replacing the portion corresponding to git diff-index --cached --name-only --diff-filter=A $CTREE >"$a" git read-tree --reset $CTREE git update-index --add --stdin <"$a" rm -f "$a" into a library function that does the same thing. (The read-tree --reset was already partially converted over to a library call, but as an independent piece.) Note here that this came after a merge operation was performed. The merge machinery always stages anything that cleanly merges, and the above code only runs if there are no conflicts. Its purpose is to make it so that when there are no conflicts, all the changes from the stash are unstaged. However, that causes brand new files from the stash to become untracked, so the code above first saves those files off and then re-adds them afterwards. We replace the whole series of commands with a simple function that will unstage files that are not newly added. This doesn't fix any bugs in the usage of these commands, it simply matches the existing behavior but makes it into a single atomic operation that we can then operate on as a whole. A subsequent commit will take advantage of this to fix issues with these commands in sparse-checkouts. This conversion incidentally fixes t3906.1, because the separate update-index process would die with the following error messages: error: uninitialized_sub: is a directory - add files inside instead fatal: Unable to process path uninitialized_sub The unstaging of the directory as a submodule meant it was no longer tracked, and thus as an uninitialized directory it could not be added back using `git update-index --add`, thus resulting in this error and early abort. Most of the submodule tests in 3906 continue to fail after this change, this change was just enough to push the first of those tests to success. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2020-12-01 14:39:04 -08:00
.github	Merge branch 'js/ci-github-set-env'	2020-11-11 13:18:39 -08:00
Documentation	Sixth batch	2020-11-18 13:33:25 -08:00
block-sha1	…
builtin	stash: remove unnecessary process forking	2020-12-01 14:39:04 -08:00
ci	ci: do not skip tagged revisions in GitHub workflows	2020-10-08 11:58:41 -07:00
compat	compat/bswap.h: don't assume MSVC is little-endian	2020-11-11 11:24:47 -08:00
contrib	Merge branch 'sd/prompt-local-variable'	2020-11-11 13:18:38 -08:00
ewah	…
git-gui	Merge https://github.com/prati0100/git-gui	2020-10-17 13:10:58 -07:00
gitk-git	…
gitweb	…
mergetools	…
negotiator	…
perl	Merge branch 'jk/perl-warning'	2020-11-09 14:06:25 -08:00
po	Merge branch 'master' of github.com:Softcatala/git-po	2020-10-18 09:56:33 +08:00
ppc	…
refs	…
sha1collisiondetection@855827c583	…
sha1dc	…
sha256	…
t	stash: remove unnecessary process forking	2020-12-01 14:39:04 -08:00
templates	hook: add sample template for push-to-checkout	2020-10-16 08:47:02 -07:00
trace2	…
vcs-svn	…
xdiff	diff: add -I<regex> that ignores matching changes	2020-10-20 12:53:26 -07:00
.cirrus.yml	…
.clang-format	…
.editorconfig	…
.gitattributes	…
.gitignore	Merge branch 'ds/maintenance-part-3'	2020-11-18 13:32:53 -08:00
.gitmodules	…
.mailmap	…
.travis.yml	…
.tsan-suppressions	…
CODE_OF_CONDUCT.md	…
COPYING	…
GIT-VERSION-GEN	Git 2.29.2	2020-10-29 14:24:09 -07:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'en/merge-ort-api-null-impl'	2020-11-18 13:32:53 -08:00
README.md	…
RelNotes	Git 2.29.2	2020-10-29 14:24:09 -07:00
abspath.c	…
aclocal.m4	…
add-interactive.c	…
add-interactive.h	…
add-patch.c	Merge branch 'dl/checkout-p-merge-base'	2020-10-27 15:09:51 -07:00
advice.c	…
advice.h	…
alias.c	…
alias.h	…
alloc.c	…
alloc.h	…
apply.c	apply: when -R, also reverse list of sections	2020-10-20 15:21:41 -07:00
apply.h	…
archive-tar.c	archive: support compression levels beyond 9	2020-11-09 11:25:45 -08:00
archive-zip.c	…
archive.c	archive: support compression levels beyond 9	2020-11-09 11:25:45 -08:00
archive.h	archive: support compression levels beyond 9	2020-11-09 11:25:45 -08:00
attr.c	…
attr.h	…
banned.h	…
base85.c	…
bisect.c	bisect: clear flags in passed repository	2020-10-31 10:46:34 -07:00
bisect.h	…
blame.c	blame: simplify 'setup_blame_bloom_data' interface	2020-11-01 15:54:15 -08:00
blame.h	blame: simplify 'setup_blame_bloom_data' interface	2020-11-01 15:54:15 -08:00
blob.c	…
blob.h	…
bloom.c	…
bloom.h	…
branch.c	…
branch.h	…
builtin.h	Merge branch 'ds/maintenance-part-3'	2020-11-18 13:32:53 -08:00
bulk-checkin.c	…
bulk-checkin.h	…
bundle.c	…
bundle.h	…
cache-tree.c	…
cache-tree.h	…
cache.h	…
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-merging-fix'	2020-11-02 13:17:39 -08:00
commit-graph.h	…
commit-reach.c	…
commit-reach.h	…
commit-slab-decl.h	…
commit-slab-impl.h	…
commit-slab.h	…
commit.c	Documentation: stylistically normalize references to Signed-off-by:	2020-10-20 11:57:40 -07:00
commit.h	…
common-main.c	…
config.c	…
config.h	…
config.mak.dev	Merge branch 'jc/sparse-error-for-developer-build'	2020-11-18 13:32:54 -08:00
config.mak.in	…
config.mak.uname	…
configure.ac	…
connect.c	…
connect.h	…
connected.c	…
connected.h	…
convert.c	…
convert.h	…
copy.c	…
credential.c	…
credential.h	…
csum-file.c	…
csum-file.h	…
ctype.c	…
daemon.c	…
date.c	…
decorate.c	…
decorate.h	…
delta-islands.c	…
delta-islands.h	…
delta.h	…
detect-compiler	…
diff-delta.c	…
diff-lib.c	Merge branch 'nk/diff-files-vs-fsmonitor'	2020-11-09 14:06:25 -08:00
diff-no-index.c	…
diff.c	Merge branch 'mk/diff-ignore-regex'	2020-11-02 13:17:44 -08:00
diff.h	Merge branch 'mk/diff-ignore-regex'	2020-11-02 13:17:44 -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 'nk/dir-c-comment-update'	2020-11-02 13:17:42 -08:00
dir.h	…
editor.c	…
entry.c	…
environment.c	…
exec-cmd.c	…
exec-cmd.h	…
fetch-negotiator.c	…
fetch-negotiator.h	…
fetch-pack.c	…
fetch-pack.h	…
fmt-merge-msg.c	fmt-merge-msg: also suppress "into main" by default	2020-10-23 08:57:39 -07:00
fmt-merge-msg.h	…
fsck.c	…
fsck.h	…
fsmonitor.c	…
fsmonitor.h	…
fuzz-commit-graph.c	…
fuzz-pack-headers.c	…
fuzz-pack-idx.c	…
generate-cmdlist.sh	…
generate-configlist.sh	…
gettext.c	…
gettext.h	…
git-add--interactive.perl	Merge branch 'dl/checkout-p-merge-base'	2020-10-27 15:09:51 -07:00
git-archimport.perl	…
git-bisect.sh	Merge branch 'mr/bisect-in-c-3'	2020-11-09 14:06:25 -08:00
git-compat-util.h	Merge branch 'jk/report-fn-typedef'	2020-11-02 13:17:42 -08:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	…
git-difftool--helper.sh	…
git-filter-branch.sh	…
git-instaweb.sh	…
git-merge-octopus.sh	…
git-merge-one-file.sh	…
git-merge-resolve.sh	…
git-mergetool--lib.sh	…
git-mergetool.sh	…
git-p4.py	Merge branch 'js/p4-default-branch'	2020-11-11 13:18:38 -08:00
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	…
git-svn.perl	perl: check for perl warnings while running tests	2020-10-21 23:11:48 -07:00
git-web--browse.sh	…
git.c	Merge branch 'ds/maintenance-part-3'	2020-11-18 13:32:53 -08:00
git.rc	…
gpg-interface.c	…
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	…
grep.h	…
hash.h	…
hashmap.c	…
hashmap.h	…
help.c	…
help.h	…
hex.c	…
http-backend.c	…
http-fetch.c	…
http-push.c	…
http-walker.c	…
http.c	…
http.h	…
ident.c	…
imap-send.c	…
iterator.h	…
json-writer.c	…
json-writer.h	…
khash.h	…
kwset.c	…
kwset.h	…
levenshtein.c	…
levenshtein.h	…
line-log.c	line-log: handle deref_tag() returning NULL	2020-10-12 12:25:14 -07:00
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	…
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-ort-wrappers.c	merge-ort-wrappers: new convience wrappers to mimic the old merge API	2020-10-26 22:36:14 -07:00
merge-ort-wrappers.h	merge-ort-wrappers: new convience wrappers to mimic the old merge API	2020-10-26 22:36:14 -07:00
merge-ort.c	merge-ort: barebones API of new merge strategy with empty implementation	2020-10-26 22:36:10 -07:00
merge-ort.h	merge-ort: barebones API of new merge strategy with empty implementation	2020-10-26 22:36:10 -07:00
merge-recursive.c	…
merge-recursive.h	…
merge.c	…
mergesort.c	…
mergesort.h	…
midx.c	Merge branch 'ds/maintenance-part-2'	2020-10-27 15:09:47 -07:00
midx.h	…
name-hash.c	…
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	…
object.c	object: allow clear_commit_marks_all to handle any repo	2020-10-31 10:46:34 -07:00
object.h	object: allow clear_commit_marks_all to handle any repo	2020-10-31 10:46:34 -07:00
oid-array.c	…
oid-array.h	…
oidmap.c	…
oidmap.h	…
oidset.c	blame: silently ignore invalid ignore file objects	2020-11-10 13:05:06 -08:00
oidset.h	…
pack-bitmap-write.c	…
pack-bitmap.c	…
pack-bitmap.h	…
pack-check.c	…
pack-objects.c	…
pack-objects.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	pack-write: use hashwrite_be32() instead of double-buffering array	2020-11-01 15:52:51 -08:00
pack.h	…
packfile.c	…
packfile.h	…
pager.c	…
parse-options-cb.c	…
parse-options.c	…
parse-options.h	…
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	…
path.h	…
pathspec.c	…
pathspec.h	…
pkt-line.c	sideband: diagnose more sideband anomalies	2020-10-29 09:23:29 -07:00
pkt-line.h	…
preload-index.c	…
pretty.c	…
pretty.h	…
prio-queue.c	…
prio-queue.h	…
progress.c	…
progress.h	…
promisor-remote.c	…
promisor-remote.h	…
prompt.c	…
prompt.h	…
protocol.c	…
protocol.h	…
prune-packed.c	…
prune-packed.h	…
quote.c	…
quote.h	…
range-diff.c	…
range-diff.h	…
reachable.c	…
reachable.h	…
read-cache.c	…
rebase-interactive.c	…
rebase-interactive.h	…
rebase.c	…
rebase.h	…
ref-filter.c	ref-filter: handle CRLF at end-of-line more gracefully	2020-10-29 12:57:45 -07:00
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
refs.c	tests: start moving to a different default main branch name	2020-10-23 08:57:40 -07:00
refs.h	…
refspec.c	Merge branch 'sb/clone-origin'	2020-10-27 15:09:50 -07:00
refspec.h	Merge branch 'sb/clone-origin'	2020-10-27 15:09:50 -07:00
remote-curl.c	…
remote.c	Merge branch 'sk/force-if-includes'	2020-10-27 15:09:49 -07:00
remote.h	Merge branch 'sk/force-if-includes'	2020-10-27 15:09:49 -07:00
replace-object.c	…
replace-object.h	…
repo-settings.c	Merge branch 'ds/maintenance-part-2'	2020-10-27 15:09:47 -07:00
repository.c	…
repository.h	Merge branch 'ds/maintenance-part-2'	2020-10-27 15:09:47 -07:00
rerere.c	…
rerere.h	…
reset.c	…
reset.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	…
revision.h	…
run-command.c	…
run-command.h	…
send-pack.c	Merge branch 'sk/force-if-includes'	2020-10-27 15:09:49 -07:00
send-pack.h	…
sequencer.c	Merge branch 'en/merge-ort-api-null-impl'	2020-11-18 13:32:53 -08:00
sequencer.h	Merge branch 'en/merge-ort-api-null-impl'	2020-11-18 13:32:53 -08:00
serve.c	…
serve.h	…
server-info.c	…
setup.c	…
sh-i18n--envsubst.c	…
sha1-file.c	…
sha1-lookup.c	…
sha1-lookup.h	…
sha1-name.c	…
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	…
shallow.h	…
shell.c	…
shortlog.h	…
sideband.c	Merge branch 'jk/sideband-more-error-checking'	2020-11-09 14:06:29 -08:00
sideband.h	sideband: diagnose more sideband anomalies	2020-10-29 09:23:29 -07:00
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	…
strvec.c	…
strvec.h	…
sub-process.c	…
sub-process.h	…
submodule-config.c	…
submodule-config.h	…
submodule.c	…
submodule.h	…
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	…
transport-internal.h	…
transport.c	…
transport.h	…
tree-diff.c	…
tree-walk.c	…
tree-walk.h	…
tree.c	…
tree.h	…
unicode-width.h	…
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unpack-trees.c	…
unpack-trees.h	…
upload-pack.c	upload-pack: allow stateless client EOF just prior to haves	2020-10-30 21:18:10 -07:00
upload-pack.h	…
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	usage: define a type for a reporting function	2020-10-16 08:33:58 -07:00
userdiff.c	Merge branch 've/userdiff-bash'	2020-11-02 13:17:46 -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

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