Git with broken hash generation to generate collisions between object IDs. Don't use this! https://undefinedbehavior.de/posts/commit-vandalism/
Go to file
SZEDER Gábor a5bf824f3b t: prevent '-x' tracing from interfering with test helpers' stderr
Running a test script with '-x' turns on 'set -x' tracing, the output
of which is normally sent to stderr.  This causes a lot of
test failures, because many tests redirect and verify the stderr
of shell functions, most frequently that of 'test_must_fail'.
These issues were worked around somewhat in d88785e424 (test-lib: set
BASH_XTRACEFD automatically, 2016-05-11), so at least we could
reliably run tests with '-x' tracing under a Bash version supporting
BASH_XTRACEFD, i.e. v4.1 and later.

Futhermore, redirecting the stderr of test helper functions like
'test_must_fail' or 'test_expect_code' is the cause of a different
issue as well.  If these functions detect something unexpected, they
will write their error messages intended to the user to thier stderr.
However, if their stderr is redirected in order to save and verify the
stderr of the tested git command invoked in the function, then the
function's error messages will be redirected as well.  Consequently,
those messages won't reach the user, making the test's verbose output
less useful.

This patch makes it safe to redirect and verify the stderr of those
test helper functions which are meant to run the tested command given
as argument, even when running tests with '-x' and /bin/sh.  This is
achieved through a couple of file descriptor redirections:

  - Duplicate stderr of the tested command executed in the test helper
    function from the function's fd 7 (see next point), to ensure that
    the tested command's error messages go to a different fd than the
    '-x' trace of the commands executed in the function or the
    function's error messages.

  - Duplicate the test helper function's fd 7 from the function's
    original stderr, meaning that, after taking a detour through fd 7,
    the error messages of the tested command do end up on the
    function's original stderr.

  - Duplicate stderr of the test helper function from fd 4, i.e. the
    fd connected to the test script's original stderr and the fd used
    for BASH_XTRACEFD.  This ensures that the '-x' trace of the
    commands executed in the function

      - doesn't go to the function's original stderr, so it won't mess
	with callers who want to save and verify the tested command's
	stderr.

      - does go to the same fd independently from the shell running
        the test script, be it /bin/sh, an older Bash without
        BASH_XTRACEFD, or a more recent Bash already supporting
        BASH_XTRACEFD.

    Furthermore, this also makes sure that the function's error
    messages go to this fd 4, meaning that the user will be able to
    see them even if the function's stderr is redirected in the test.

  - Specify the latter two redirections above in the test helper
    function's definition, so they are performed every time the
    function is invoked, without the need to modify the callsites of
    the function.

Perform these redirections in those test helper functions which can be
expected to have their stderr redirected, i.e. in the functions
'test_must_fail', 'test_might_fail', 'test_expect_code', 'test_env',
'nongit', 'test_terminal' and 'perl'.  Note that 'test_might_fail',
'test_env', and 'nongit' are not involved in any test failures when
running tests with '-x' and /bin/sh.

The other test helper functions are left unchanged, because they
either don't run commands specified as their arguments, or redirecting
their stderr wouldn't make sense, or both.

With this change the number of failures when running the test suite
with '-x' tracing and /bin/sh goes down from 340 failed tests in 43
test scripts to 22 failed tests in 6 scripts (or 23 in 7, if the
system (OSX) uses an older Bash version without BASH_XTRACEFD to run
't9903-bash-prompt.sh').

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-02-27 12:43:13 -08:00
.github Configure Git contribution guidelines for github.com 2017-06-13 08:41:47 -07:00
block-sha1
builtin Merge branch 'gs/rebase-allow-empty-message' 2018-02-21 12:45:04 -08:00
ci Merge branch 'sg/travis-linux32-sanity' 2018-02-13 13:39:16 -08:00
compat Merge branch 'bp/fsmonitor' 2017-11-21 14:07:50 +09:00
contrib Merge branch 'rs/cocci-strbuf-addf-to-addstr' 2018-02-15 14:55:44 -08:00
Documentation Fourth batch for 2.17 2018-02-21 12:45:35 -08:00
ewah Replace Free Software Foundation address in license notices 2017-11-09 13:21:21 +09:00
git-gui Merge branch 'js/misc-git-gui-stuff' of ../git-gui 2018-01-09 11:07:03 -08:00
gitk-git
gitweb Merge branch 'gc/gitweb-filetest-acl' 2017-11-06 14:24:30 +09:00
mergetools mergetools/meld: improve compatibiilty with Meld on macOS X 2017-06-18 22:11:29 -07:00
perl Merge branch 'ab/simplify-perl-makefile' 2018-02-13 13:39:03 -08:00
po l10n: de.po: translate 72 new messages 2018-01-15 07:47:30 +01:00
ppc
refs Merge branch 'kg/packed-ref-cache-fix' 2018-02-15 14:55:42 -08:00
sha1collisiondetection@19d97bf5af sha1dc: optionally use sha1collisiondetection as a submodule 2017-07-03 10:09:34 -07:00
sha1dc Merge branch 'ab/sha1dc-maint' 2017-07-06 18:14:44 -07:00
t t: prevent '-x' tracing from interfering with test helpers' stderr 2018-02-27 12:43:13 -08:00
templates fsmonitor: simplify determining the git worktree under Windows 2017-11-13 10:02:20 +09:00
vcs-svn Merge branch 'jn/vcs-svn-cleanup' into maint 2017-09-10 17:03:09 +09:00
xdiff Merge branch 'jt/diff-anchored-patience' 2017-12-19 11:33:56 -08:00
.clang-format clang-format: adjust penalty for return type line break 2018-01-24 13:42:04 -08:00
.gitattributes Fix build with core.autocrlf=true 2017-05-10 13:32:50 +09:00
.gitignore
.gitmodules sha1dc: optionally use sha1collisiondetection as a submodule 2017-07-03 10:09:34 -07:00
.mailmap mailmap: use Kaartic Sivaraam's new address 2017-11-03 23:00:07 +09:00
.travis.yml travis-ci: don't install default addon packages for the 32 bit Linux build 2017-12-27 12:14:39 -08:00
.tsan-suppressions ThreadSanitizer: add suppressions 2017-08-23 10:38:56 -07:00
abspath.c real_path: clarify return value ownership 2017-09-27 09:13:47 +09:00
aclocal.m4
advice.c Merge branch 'ls/editor-waiting-message' 2017-12-19 11:33:59 -08:00
advice.h Merge branch 'ls/editor-waiting-message' 2017-12-19 11:33:59 -08:00
alias.c Merge branch 'js/alias-case-sensitivity' 2017-07-20 16:29:59 -07:00
alloc.c
apply.c Merge branch 'po/object-id' 2018-02-15 14:55:43 -08:00
apply.h apply: remove newfd from struct apply_state 2017-10-06 10:07:18 +09:00
archive-tar.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
archive-zip.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
archive.c refs: convert dwim_ref and expand_ref to struct object_id 2017-10-16 11:05:51 +09:00
archive.h timestamp_t: a new data type for timestamps 2017-04-27 13:07:39 +09:00
argv-array.c
argv-array.h
attr.c hashmap: add API to disable item counting when threaded 2017-09-07 09:42:02 +09:00
attr.h
base85.c
bisect.c Merge branch 'rs/lose-leak-pending' into maint 2018-02-15 15:18:11 -08:00
bisect.h Merge branch 'ma/bisect-leakfix' 2017-11-15 12:14:28 +09:00
blame.c sha1_file: convert pretend_sha1_file to object_id 2018-01-30 10:42:35 -08:00
blame.h blame: move entry prepend to libgit 2017-05-25 13:08:23 +09:00
blob.c Convert lookup_blob to struct object_id 2017-05-08 15:12:57 +09:00
blob.h Convert lookup_blob to struct object_id 2017-05-08 15:12:57 +09:00
branch.c Merge branch 'ks/branch-cleanup' 2017-12-27 11:16:25 -08:00
branch.h Merge branch 'ks/branch-cleanup' 2017-12-27 11:16:25 -08:00
builtin.h git.c: provide setup_auto_pager() 2017-08-03 11:08:10 -07:00
bulk-checkin.c bulk-checkin: abstract SHA-1 usage 2018-02-02 11:28:41 -08:00
bulk-checkin.h
bundle.c Merge branch 'rs/lose-leak-pending' into maint 2018-02-15 15:18:11 -08:00
bundle.h bundle: convert to struct object_id 2017-05-02 10:46:41 +09:00
cache-tree.c Merge branch 'po/object-id' 2018-02-15 14:55:43 -08:00
cache-tree.h Convert struct cache_tree to use struct object_id 2017-05-02 10:46:41 +09:00
cache.h Merge branch 'bc/hash-algo' 2018-02-15 14:55:47 -08:00
check_bindir
check-builtins.sh
check-racy.c
checkout.c checkout: factor out functions to new lib file 2017-11-27 09:48:06 +09:00
checkout.h checkout: factor out functions to new lib file 2017-11-27 09:48:06 +09:00
color.c refactor "dumb" terminal determination 2017-12-04 09:38:30 -08:00
color.h diff.c: add dimming to moved line detection 2017-06-30 13:59:42 -07:00
column.c column: do not include pager.c 2017-10-24 10:19:06 +09:00
column.h
combine-diff.c Merge branch 'tb/crlf-conv-flags' 2018-02-13 13:39:08 -08:00
command-list.txt
commit-slab.h commit-slab.h: avoid -Wsign-compare warnings 2017-09-22 13:00:36 +09:00
commit.c Merge branch 'po/object-id' 2018-02-15 14:55:43 -08:00
commit.h Merge branch 'rs/lose-leak-pending' into maint 2018-02-15 15:18:11 -08:00
common-main.c
config.c Merge branch 'tb/crlf-conv-flags' 2018-02-13 13:39:08 -08:00
config.h Merge branch 'hm/config-parse-expiry-date' 2017-12-06 09:23:37 -08:00
config.mak.in
config.mak.uname packed_ref_cache: keep the packed-refs file mmapped if possible 2017-09-25 18:02:45 +09:00
configure.ac Makefile: NO_OPENSSL=1 should no longer imply BLK_SHA1=1 2017-12-28 11:55:56 -08:00
connect.c connect: correct style of C-style comment 2017-11-21 14:01:03 +09:00
connect.h
connected.c Merge branch 'jh/partial-clone' 2018-02-13 13:39:04 -08:00
connected.h Convert check_connected to use struct object_id 2017-10-16 11:05:50 +09:00
convert.c Merge branch 'po/object-id' 2018-02-15 14:55:43 -08:00
convert.h convert_to_git(): safe_crlf/checksafe becomes int conv_flags 2018-01-16 12:35:56 -08:00
copy.c
COPYING
credential-cache--daemon.c tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
credential-cache.c Merge branch 'dl/credential-cache-socket-in-xdg-cache' into maint 2017-08-23 14:33:45 -07:00
credential-store.c path.c: and an option to call real_path() in expand_user_path() 2017-04-14 23:51:38 -07:00
credential.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
credential.h
csum-file.c csum-file: abstract uses of SHA-1 2018-02-02 11:28:41 -08:00
csum-file.h csum-file: abstract uses of SHA-1 2018-02-02 11:28:41 -08:00
ctype.c
daemon.c Merge branch 'lw/daemon-log-destination' 2018-02-21 12:45:04 -08:00
date.c Merge branch 'ab/strbuf-addftime-tzname-boolify' 2017-07-06 18:14:47 -07:00
decorate.c decorate: clean up and document API 2017-12-08 09:16:27 -08:00
decorate.h decorate: clean up and document API 2017-12-08 09:16:27 -08:00
delta.h
diff-delta.c Merge branch 'mk/diff-delta-avoid-large-offset' 2017-09-28 14:47:56 +09:00
diff-lib.c trace: measure where the time is spent in the index-heavy operations 2018-02-02 11:20:16 -08:00
diff-no-index.c diff: make struct diff_flags members lowercase 2017-11-01 11:51:40 +09:00
diff.c Merge branch 'nd/diff-flush-before-warning' 2018-02-13 13:39:09 -08:00
diff.h Merge branch 'sb/diff-blobfind-pickaxe' 2018-01-23 13:16:37 -08:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c wildmatch: remove unused wildopts parameter 2017-06-23 18:27:07 -07:00
diffcore-pickaxe.c diff: properly error out when combining multiple pickaxe options 2018-01-04 15:02:40 -08:00
diffcore-rename.c Merge branch 'po/object-id' 2018-02-15 14:55:43 -08:00
diffcore.h diff: convert fill_filespec to struct object_id 2017-06-02 09:36:07 +09:00
dir-iterator.c
dir-iterator.h
dir.c Merge branch 'nd/trace-index-ops' 2018-02-15 14:55:44 -08:00
dir.h dir: convert struct sha1_stat to use object_id 2018-01-30 10:42:36 -08:00
editor.c launch_editor(): indicate that Git waits for user input 2017-12-07 10:10:19 -08:00
entry.c Merge branch 'bp/fsmonitor' 2017-11-21 14:07:50 +09:00
environment.c Merge branch 'tb/crlf-conv-flags' 2018-02-13 13:39:08 -08:00
exec_cmd.c git_extract_argv0_path: do nothing without RUNTIME_PREFIX 2017-09-07 09:41:14 +09:00
exec_cmd.h
fast-import.c csum-file: rename sha1file to hashfile 2018-02-02 11:28:41 -08:00
fetch-object.c unpack-trees: batch fetching of missing blobs 2017-12-08 09:58:51 -08:00
fetch-object.h unpack-trees: batch fetching of missing blobs 2017-12-08 09:58:51 -08:00
fetch-pack.c Merge branch 'jh/partial-clone' 2018-02-13 13:39:04 -08:00
fetch-pack.h fetch-pack, index-pack, transport: partial clone 2017-12-08 09:58:51 -08:00
fmt-merge-msg.h
fsck.c Merge branch 'rs/fsck-null-return-from-lookup' 2017-10-11 14:52:23 +09:00
fsck.h Rename sha1_array to oid_array 2017-03-31 08:33:56 -07:00
fsmonitor.c fsmonitor: store fsmonitor bitmap before splitting index 2017-11-10 14:05:01 +09:00
fsmonitor.h fsmonitor: store fsmonitor bitmap before splitting index 2017-11-10 14:05:01 +09:00
generate-cmdlist.sh generate-cmdlist: avoid non-deterministic output 2017-11-22 14:56:30 +09:00
gettext.c
gettext.h
git-add--interactive.perl add--interactive: ignore submodule changes except HEAD 2018-01-16 12:32:45 -08:00
git-archimport.perl archimport: use safe_pipe_capture for user input 2017-09-12 11:08:15 +09:00
git-bisect.sh Merge branch 'sb/bisect-run-empty' 2017-11-15 12:14:36 +09:00
git-compat-util.h git-compat-util: introduce skip_to_optional_arg() 2017-12-11 16:10:12 -08:00
git-cvsexportcommit.perl
git-cvsimport.perl cvsimport: apply shell-quoting regex globally 2017-12-08 09:02:54 -08:00
git-cvsserver.perl cvsserver: use safe_pipe_capture for constant commands as well 2017-09-11 14:52:29 +09:00
git-difftool--helper.sh
git-filter-branch.sh Merge branch 'dg/filter-branch-filter-order-doc' 2017-10-19 14:45:45 +09:00
git-instaweb.sh git-instaweb: use @SHELL_PATH@ instead of /bin/sh 2015-03-10 15:10:35 -07:00
git-merge-octopus.sh Merge branch 'ma/up-to-date' 2017-09-10 17:08:22 +09:00
git-merge-one-file.sh scripts: use "git foo" not "git-foo" 2017-08-07 12:04:45 -07:00
git-merge-resolve.sh scripts: use "git foo" not "git-foo" 2017-08-07 12:04:45 -07:00
git-mergetool--lib.sh
git-mergetool.sh
git-p4.py git-p4: update multiple shelved change lists 2017-12-22 13:30:52 -08:00
git-parse-remote.sh
git-quiltimport.sh
git-rebase--am.sh rebase: add --allow-empty-message option 2018-02-07 11:26:46 -08:00
git-rebase--interactive.sh rebase: add --allow-empty-message option 2018-02-07 11:26:46 -08:00
git-rebase--merge.sh rebase: add --allow-empty-message option 2018-02-07 11:26:46 -08:00
git-rebase.sh rebase: add --allow-empty-message option 2018-02-07 11:26:46 -08:00
git-remote-testgit.sh
git-request-pull.sh request-pull: capitalise "Git" to make it a proper noun 2017-10-03 13:11:57 +09:00
git-send-email.perl Merge branch 'ab/simplify-perl-makefile' 2018-02-13 13:39:03 -08:00
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh Merge branch 'tg/stash-with-pathspec-fix' into maint 2018-02-15 15:18:13 -08:00
git-submodule.sh submodule: port submodule subcommand 'deinit' from shell to C 2018-01-16 11:29:50 -08:00
git-svn.perl Merge branch 'jm/svn-pushmergeinfo-fix' into maint 2018-02-15 15:18:11 -08:00
GIT-VERSION-GEN Git 2.16.2 2018-02-15 15:21:23 -08:00
git-web--browse.sh
git.c Merge branch 'ma/branch-list-paginate' 2017-11-28 13:41:50 +09:00
git.rc mingw: include the full version information in the resources 2017-11-01 13:43:52 +09:00
gpg-interface.c tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
gpg-interface.h
graph.c graph: use strbuf_addchars() to add spaces 2017-10-02 13:14:07 +09:00
graph.h
grep.c Merge branch 'ab/pcre2-grep' 2017-12-13 13:28:54 -08:00
grep.h Merge branch 'ab/pcre-v2' into maint 2017-11-21 14:05:30 +09:00
hash.h hash: update obsolete reference to SHA1_HEADER 2018-02-09 09:56:10 -08:00
hashmap.c hashmap: add API to disable item counting when threaded 2017-09-07 09:42:02 +09:00
hashmap.h Merge branch 'rb/hashmap-h-compilation-fix' 2018-02-13 13:39:10 -08:00
help.c version --build-options: report commit, too, if possible 2017-12-14 22:53:04 -08:00
help.h
hex.c notes: move hex_to_bytes() to hex.c and export it 2017-11-01 10:35:35 +09:00
http-backend.c Merge branch 'rs/resolve-ref-optional-result' 2017-09-28 14:47:56 +09:00
http-fetch.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
http-push.c http-push: improve error log 2018-01-24 13:42:23 -08:00
http-walker.c sha1_file: remove static strbuf from sha1_file_name() 2018-01-17 12:21:32 -08:00
http.c Merge branch 'jt/http-redact-cookies' 2018-02-13 13:39:11 -08:00
http.h http.postbuffer: allow full range of ssize_t values 2017-04-13 18:24:32 -07:00
ident.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
imap-send.c imap-send: URI encode server folder 2017-12-18 13:57:06 -08:00
INSTALL Makefile: replace perl/Makefile.PL with simple make rules 2017-12-11 15:28:10 -08:00
iterator.h
khash.h
kwset.c Replace Free Software Foundation address in license notices 2017-11-09 13:21:21 +09:00
kwset.h Replace Free Software Foundation address in license notices 2017-11-09 13:21:21 +09:00
levenshtein.c
levenshtein.h Typofixes outside documentation area 2010-02-03 21:28:17 -08:00
LGPL-2.1
line-log.c ALLOC_GROW: avoid -Wsign-compare warnings 2017-09-22 13:21:11 +09:00
line-log.h ALLOC_GROW: avoid -Wsign-compare warnings 2017-09-22 13:21:11 +09:00
line-range.c
line-range.h
list-objects-filter-options.c fetch: inherit filter-spec from partial clone 2017-12-08 09:58:52 -08:00
list-objects-filter-options.h fetch: inherit filter-spec from partial clone 2017-12-08 09:58:52 -08:00
list-objects-filter.c list-objects: filter objects in traverse_commit_list 2017-11-22 14:11:57 +09:00
list-objects-filter.h list-objects: filter objects in traverse_commit_list 2017-11-22 14:11:57 +09:00
list-objects.c Merge branch 'jh/fsck-promisors' 2018-02-13 13:39:03 -08:00
list-objects.h list-objects: filter objects in traverse_commit_list 2017-11-22 14:11:57 +09:00
list.h tempfile: use list.h for linked list 2017-09-06 17:19:54 +09:00
ll-merge.c avoid "write_in_full(fd, buf, len) != len" pattern 2017-09-14 15:17:59 +09:00
ll-merge.h
lockfile.c tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
lockfile.h lockfile: fix documentation on close_lock_file_gently() 2017-10-06 10:07:17 +09:00
log-tree.c sha1_file: convert hash_sha1_file to object_id 2018-01-30 10:42:36 -08:00
log-tree.h log: add option to choose which refs to decorate 2017-11-22 13:18:59 +09:00
mailinfo.c Merge branch 'jc/mailinfo-cleanup-fix' 2018-02-13 13:39:14 -08:00
mailinfo.h
mailmap.c Convert remaining callers of get_sha1 to get_oid. 2017-07-17 13:54:51 -07:00
mailmap.h
Makefile Merge branch 'ab/sha1dc-build' 2018-02-15 14:55:40 -08:00
match-trees.c sha1_file: convert write_sha1_file to object_id 2018-01-30 10:42:36 -08:00
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'jc/merge-symlink-ours-theirs' into maint 2018-02-15 15:18:12 -08:00
merge-recursive.h merge-recursive: change current file dir string_lists to hashmap 2017-09-08 10:36:16 +09:00
merge.c Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty-index 2017-12-22 12:48:38 -08:00
mergesort.c
mergesort.h
name-hash.c trace: measure where the time is spent in the index-heavy operations 2018-02-02 11:20:16 -08:00
notes-cache.c sha1_file: convert write_sha1_file to object_id 2018-01-30 10:42:36 -08:00
notes-cache.h notes-cache: convert to struct object_id 2017-05-08 15:12:57 +09:00
notes-merge.c commit: convert commit_tree* to object_id 2018-01-30 10:42:36 -08:00
notes-merge.h notes-merge: convert notes_merge* to struct object_id 2017-06-05 11:23:58 +09:00
notes-utils.c notes: convert write_notes_tree to object_id 2018-01-30 10:42:36 -08:00
notes-utils.h commit: convert commit_tree* to object_id 2018-01-30 10:42:36 -08:00
notes.c sha1_file: convert write_sha1_file to object_id 2018-01-30 10:42:36 -08:00
notes.h notes: convert write_notes_tree to object_id 2018-01-30 10:42:36 -08:00
object.c Merge branch 'jh/fsck-promisors' 2018-02-13 13:39:03 -08:00
object.h Merge branch 'rs/lose-leak-pending' into maint 2018-02-15 15:18:11 -08:00
oidmap.c oidmap: ensure map is initialized 2017-12-27 12:28:06 -08:00
oidmap.h oidmap: add oidmap iterator methods 2017-11-22 14:11:56 +09:00
oidset.c oidset: add iterator methods to oidset 2017-11-22 14:11:56 +09:00
oidset.h oidset: don't return value from oidset_init 2018-01-08 15:24:35 -08:00
pack-bitmap-write.c csum-file: rename sha1file to hashfile 2018-02-02 11:28:41 -08:00
pack-bitmap.c pack-bitmap: convert traverse_bitmap_commit_list to object_id 2017-10-16 11:05:51 +09:00
pack-bitmap.h pack-bitmap: convert traverse_bitmap_commit_list to object_id 2017-10-16 11:05:51 +09:00
pack-check.c pack-check: convert various uses of SHA-1 to abstract forms 2018-02-02 11:28:41 -08:00
pack-objects.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
pack-objects.h
pack-revindex.c packfile: use get_be64() for large offsets 2018-01-19 11:04:56 -08:00
pack-revindex.h
pack-write.c csum-file: rename sha1file to hashfile 2018-02-02 11:28:41 -08:00
pack.h csum-file: rename sha1file to hashfile 2018-02-02 11:28:41 -08:00
packfile.c Merge branch 'ds/use-get-be64' 2018-02-13 13:39:11 -08:00
packfile.h fsck: introduce partialclone extension 2017-12-05 09:46:05 -08:00
pager.c Merge branch 'ma/parse-maybe-bool' 2017-08-22 10:29:03 -07:00
parse-options-cb.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
parse-options.c Use MOVE_ARRAY 2018-01-22 11:32:51 -08:00
parse-options.h ref-filter: add --no-contains option to tag/branch/for-each-ref 2017-03-24 12:15:26 -07:00
patch-delta.c
patch-ids.c diff: make struct diff_flags members lowercase 2017-11-01 11:51:40 +09:00
patch-ids.h patch-ids: convert to struct object_id 2017-06-02 09:36:07 +09:00
path.c Merge branch 'ao/path-use-xmalloc' 2017-10-28 10:18:40 +09:00
path.h path: document path functions 2017-12-13 11:14:25 -08:00
pathspec.c Merge branch 'ex/deprecate-empty-pathspec-as-match-all' 2017-11-06 13:11:29 +09:00
pathspec.h Merge branch 'bw/pathspec-match-submodule-boundary' 2017-12-19 11:33:56 -08:00
pkt-line.c Merge branch 'bw/protocol-v1' 2017-12-06 09:23:44 -08:00
pkt-line.h pkt-line: add packet_write function 2017-10-17 10:51:29 +09:00
preload-index.c trace: measure where the time is spent in the index-heavy operations 2018-02-02 11:20:16 -08:00
pretty.c log: add option to choose which refs to decorate 2017-11-22 13:18:59 +09:00
pretty.h format: create docs for pretty.h 2017-12-12 10:41:15 -08:00
prio-queue.c *.[ch] refactoring: make use of the FREE_AND_NULL() macro 2017-06-16 12:44:09 -07:00
prio-queue.h
progress.c Merge branch 'en/rename-progress' 2017-12-19 11:33:55 -08:00
progress.h progress: fix progress meters when dealing with lots of work 2017-11-15 13:11:25 +09:00
prompt.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
prompt.h
protocol.c protocol: introduce protocol extension mechanisms 2017-10-17 10:51:29 +09:00
protocol.h protocol: introduce protocol extension mechanisms 2017-10-17 10:51:29 +09:00
quote.c trace: avoid unnecessary quoting 2018-01-16 12:16:54 -08:00
quote.h trace: avoid unnecessary quoting 2018-01-16 12:16:54 -08:00
reachable.c Merge branch 'nd/prune-in-worktree' 2017-09-19 10:47:53 +09:00
reachable.h timestamp_t: a new data type for timestamps 2017-04-27 13:07:39 +09:00
read-cache.c Merge branch 'bc/hash-algo' 2018-02-15 14:55:47 -08:00
README.md
ref-filter.c Merge branch 'rs/lose-leak-pending' into maint 2018-02-15 15:18:11 -08:00
ref-filter.h ref-filter: consult want_color() before emitting colors 2017-07-13 12:42:51 -07:00
reflog-walk.c refs: convert dwim_log to struct object_id 2017-10-16 11:05:51 +09:00
reflog-walk.h reflog-walk: apply --since/--until to reflog dates 2017-07-09 10:00:48 -07:00
refs.c log: add option to choose which refs to decorate 2017-11-22 13:18:59 +09:00
refs.h log: add option to choose which refs to decorate 2017-11-22 13:18:59 +09:00
RelNotes Git 2.16.2 2018-02-15 15:21:23 -08:00
remote-curl.c fetch: support filters 2017-12-08 09:58:51 -08:00
remote-testsvn.c refs: convert read_ref and read_ref_full to object_id 2017-10-16 11:05:50 +09:00
remote.c Merge branch 'js/for-each-ref-remote-name-and-ref' 2017-11-15 12:14:32 +09:00
remote.h for-each-ref: let upstream/push report the remote ref name 2017-11-08 10:18:23 +09:00
replace_object.c Use MOVE_ARRAY 2018-01-22 11:32:51 -08:00
repository.c Merge branch 'tg/split-index-fixes' 2018-02-13 13:39:13 -08:00
repository.h Integrate hash algorithm support with repo setup 2017-11-13 13:20:44 +09:00
rerere.c Use MOVE_ARRAY 2018-01-22 11:32:51 -08:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'rs/lose-leak-pending' into maint 2018-02-15 15:18:11 -08:00
revision.h Merge branch 'rs/lose-leak-pending' into maint 2018-02-15 15:18:11 -08:00
run-command.c run-command.c: print new cwd in trace_run_command() 2018-01-19 10:49:20 -08:00
run-command.h run-command: expose is_executable function 2017-04-25 18:45:29 -07:00
send-pack.c send-pack: use internal argv_array of struct child_process 2017-12-22 13:33:53 -08:00
send-pack.h Rename sha1_array to oid_array 2017-03-31 08:33:56 -07:00
sequencer.c Merge branch 'po/object-id' 2018-02-15 14:55:43 -08:00
sequencer.h Merge branch 'pw/sequencer-in-process-commit' 2018-02-13 13:39:15 -08:00
server-info.c pack: move {,re}prepare_packed_git and approximate_object_count 2017-08-23 15:12:07 -07:00
setup.c Merge branch 'jh/fsck-promisors' 2018-02-13 13:39:03 -08:00
sh-i18n--envsubst.c Replace Free Software Foundation address in license notices 2017-11-09 13:21:21 +09:00
sha1_file.c Merge branch 'bc/hash-algo' 2018-02-15 14:55:47 -08:00
sha1_name.c Merge branch 'jc/branch-name-sanity' 2017-11-28 13:41:49 +09:00
sha1-array.c coccinelle: make use of the "type" FREE_AND_NULL() rule 2017-06-16 12:44:03 -07:00
sha1-array.h Rename sha1_array to oid_array 2017-03-31 08:33:56 -07:00
sha1-lookup.c cleanup: fix possible overflow errors in binary search 2017-10-10 08:57:24 +09:00
sha1-lookup.h sha1-lookup: remove sha1_entry_pos() from header file 2017-08-25 09:54:26 -07:00
sha1dc_git.c sha1dc: allow building with the external sha1dc library 2017-08-16 14:44:25 -07:00
sha1dc_git.h sha1dc_git.h: re-arrange an ifdef chain for a subsequent change 2017-12-08 15:01:01 -08:00
shallow.c Merge branch 'ma/leakplugs' 2017-09-29 11:23:43 +09:00
shell.c shell: drop git-cvsserver support by default 2017-09-12 11:05:58 +09:00
shortlog.h
show-index.c
sideband.c refactor "dumb" terminal determination 2017-12-04 09:38:30 -08:00
sideband.h
sigchain.c
sigchain.h
split-index.c split-index: don't write cache tree with null oid entries 2018-01-19 10:36:39 -08:00
split-index.h Revert "split-index: add and use unshare_split_index()" 2017-06-24 12:02:39 -07:00
strbuf.c Merge branch 'jd/fix-strbuf-add-urlencode-bytes' 2018-01-05 13:28:10 -08:00
strbuf.h strbuf: remove unused stripspace function alias 2017-12-05 08:50:15 -08:00
streaming.c Merge branch 'jk/write-in-full-fix' 2017-09-25 15:24:06 +09:00
streaming.h
string-list.c cleanup: fix possible overflow errors in binary search 2017-10-10 08:57:24 +09:00
string-list.h string-list.h: move documentation from Documentation/api/ into header 2017-09-27 09:14:34 +09:00
sub-process.c Merge branch 'cc/subprocess-handshake-missing-capabilities' into maint 2017-10-18 14:19:10 +09:00
sub-process.h Docs: split out long-running subprocess handshake 2018-01-25 11:24:32 -08:00
submodule-config.c Merge branch 'bw/submodule-config-cleanup' 2017-08-26 22:55:08 -07:00
submodule-config.h implement fetching of moved submodules 2017-10-17 10:27:18 +09:00
submodule.c submodule: submodule_move_head omits old argument in forced case 2018-01-05 12:35:35 -08:00
submodule.h submodule: convert get_next_submodule to not rely on the_index 2017-12-12 12:35:22 -08:00
symlinks.c
tag.c Merge branch 'rs/tag-null-pointer-arith-fix' 2017-10-05 13:48:20 +09:00
tag.h tag: convert gpg_verify_tag to use struct object_id 2017-07-13 12:02:48 -07:00
tar.h
tempfile.c tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
tempfile.h tempfile: fix documentation on delete_tempfile() 2017-10-06 10:07:18 +09:00
thread-utils.c
thread-utils.h
tmp-objdir.c
tmp-objdir.h
trace.c trace.c: move strbuf_release() out of print_trace_line() 2018-01-16 12:16:54 -08:00
trace.h trace: improve performance while category is disabled 2017-12-06 09:43:02 -08:00
trailer.c tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
trailer.h Merge branch 'jk/trailers-parse' 2017-08-26 22:55:04 -07:00
transport-helper.c Merge branch 'jh/partial-clone' 2018-02-13 13:39:04 -08:00
transport-internal.h transport: make transport vtable more private 2017-12-14 14:28:04 -08:00
transport.c Merge branch 'jh/partial-clone' 2018-02-13 13:39:04 -08:00
transport.h Merge branch 'jh/partial-clone' 2018-02-13 13:39:04 -08:00
tree-diff.c diff: make struct diff_flags members lowercase 2017-11-01 11:51:40 +09:00
tree-walk.c Merge branch 'bw/pathspec-match-submodule-boundary' 2017-12-19 11:33:56 -08:00
tree-walk.h tree-walk: convert fill_tree_descriptor() to object_id 2017-08-14 12:38:54 -07:00
tree.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
tree.h tree: convert read_tree to take an index parameter 2017-06-13 11:40:51 -07:00
unicode_width.h unicode: update the width tables to Unicode 10 2017-07-07 10:33:30 -07:00
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'jh/partial-clone' 2018-02-13 13:39:04 -08:00
unpack-trees.h
upload-pack.c Merge branch 'jh/partial-clone' 2018-02-13 13:39:04 -08:00
url.c
url.h
urlmatch.c urlmatch: use hex2chr() in append_normalized_escapes() 2017-07-09 09:43:01 -07:00
urlmatch.h
usage.c add UNLEAK annotation for reducing leak false positives 2017-09-08 15:43:17 +09:00
userdiff.c Merge branch 'ik/userdiff-html-h-element-fix' into maint 2017-10-18 14:19:02 +09:00
userdiff.h
utf8.c cleanup: fix possible overflow errors in binary search 2017-10-10 08:57:24 +09:00
utf8.h
varint.c
varint.h
version.c version --build-options: report commit, too, if possible 2017-12-14 22:53:04 -08:00
version.h version --build-options: report commit, too, if possible 2017-12-14 22:53:04 -08:00
versioncmp.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
walker.c refs: update ref transactions to use struct object_id 2017-10-16 11:05:50 +09:00
walker.h
wildmatch.c wildmatch: remove unused wildopts parameter 2017-06-23 18:27:07 -07:00
wildmatch.h wildmatch: remove unused wildopts parameter 2017-06-23 18:27:07 -07:00
worktree.c Merge branch 'bc/object-id' 2017-11-06 14:24:27 +09:00
worktree.h worktree: convert struct worktree to object_id 2017-10-16 11:05:51 +09:00
wrap-for-bin.sh Makefile: replace perl/Makefile.PL with simple make rules 2017-12-11 15:28:10 -08:00
wrapper.c wrapper.c: consistently quote filenames in error messages 2017-11-06 11:53:14 +09:00
write_or_die.c
ws.c
wt-status.c Merge branch 'nd/ita-wt-renames-in-status' 2018-01-23 13:16:28 -08:00
wt-status.h Merge branch 'nd/ita-wt-renames-in-status' 2018-01-23 13:16:28 -08:00
xdiff-interface.c xdiff-interface: export comparing and hashing strings 2017-10-26 11:23:22 +09:00
xdiff-interface.h xdiff-interface: export comparing and hashing strings 2017-10-26 11:23:22 +09:00
zlib.c

Git - fast, scalable, distributed revision control system

Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals.

Git is an Open Source project covered by the GNU General Public License version 2 (some parts of it are under different licenses, compatible with the GPLv2). It was originally written by Linus Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

Many Git online resources are accessible from https://git-scm.com/ including full documentation and Git related tools.

See Documentation/gittutorial.txt to get started, then see Documentation/giteveryday.txt for a useful minimum set of commands, and Documentation/git-.txt for documentation of each command. If git has been correctly installed, then the tutorial can also be read with man gittutorial or git help tutorial, and the documentation of each command with man git-<commandname> or git help <commandname>.

CVS users may also want to read Documentation/gitcvs-migration.txt (man gitcvs-migration or git help cvs-migration if git is installed).

The user discussion and development of Git take place on the Git mailing list -- everyone is welcome to post bug reports, feature requests, comments and patches to git@vger.kernel.org (read Documentation/SubmittingPatches for instructions on patch submission). To subscribe to the list, send an email with just "subscribe git" in the body to majordomo@vger.kernel.org. The mailing list archives are available at https://public-inbox.org/git/, http://marc.info/?l=git and other archival sites.

The maintainer frequently sends the "What's cooking" reports that list the current status of various development topics to the mailing list. The discussion following them give a good reference for project status, development direction and remaining tasks.

The name "git" was given by Linus Torvalds when he wrote the very first version. He described the tool as "the stupid content tracker" and the name as (depending on your mood):

  • random three-letter combination that is pronounceable, and not actually used by any common UNIX command. The fact that it is a mispronunciation of "get" may or may not be relevant.
  • stupid. contemptible and despicable. simple. Take your pick from the dictionary of slang.
  • "global information tracker": you're in a good mood, and it actually works for you. Angels sing, and a light suddenly fills the room.
  • "goddamn idiotic truckload of sh*t": when it breaks