development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 18:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity
No description
73571 commits 6 branches 956 tags 491 MiB
C 50.3%
Shell 38.6%
Perl 5.2%
Tcl 3.3%
Python 0.8%
Other 1.6%
Find a file
René Scharfe d7b97b7185 diff: let external diffs report that changes are uninteresting 
The options --exit-code and --quiet instruct git diff to indicate
whether it found any significant changes by exiting with code 1 if it
did and 0 if there were none.  Currently this doesn't work if external
diff programs are involved, as we have no way to learn what they found.

Add that ability in the form of the new configuration options
diff.trustExitCode and diff.<driver>.trustExitCode and the environment
variable GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE.  They pair with the config
options diff.external and diff.<driver>.command and the environment
variable GIT_EXTERNAL_DIFF, respectively.

The new options are off by default, keeping the old behavior.  Enabling
them indicates that the external diff returns exit code 1 if it finds
significant changes and 0 if it doesn't, like diff(1).

The name of the new options is taken from the git difftool and mergetool
options of similar purpose.  (There they enable passing on the exit code
of a diff tool and to infer whether a merge done by a merge tool is
successful.)

The new feature sets the diff flag diff_from_contents in
diff_setup_done() if we need the exit code and are allowed to call
external diffs.  This disables the optimization that avoids calling the
program with --quiet.  Add it back by skipping the call if the external
diff is not able to report empty diffs.  We can only do that check after
evaluating the file-specific attributes in run_external_diff().

If we do run the external diff with --quiet, send its output to
/dev/null.

I considered checking the output of the external diff to check whether
its empty.  It was added as 11be65cfa4 (diff: fix --exit-code with
external diff, 2024-05-05) and quickly reverted, as it does not work
with external diffs that do not write to stdout.  There's no reason why
a graphical diff tool would even need to write anything there at all.

I also considered using a non-zero exit code for empty diffs, which
could be done without adding new configuration options.  We'd need to
disable the optimization that allows git diff --quiet to skip calling
external diffs, though -- that might be quite surprising if graphical
diff programs are involved.  And assigning the opposite meaning of the
exit codes compared to diff(1) and git diff --exit-code to the external
diff can cause unnecessary confusion.

Suggested-by: Phillip Wood <phillip.wood123@gmail.com>
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-06-10 09:20:46 -07:00
.github Merge branch 'fixes/2.45.1/2.44' into jc/fix-2.45.1-and-friends-for-maint 2024-05-24 16:59:12 -07:00
block-sha1
builtin Merge branch 'rs/difftool-env-simplify' 2024-06-06 12:49:24 -07:00
ci Merge branch 'ps/ci-python-2-deprecation' into maint-2.45 2024-05-31 15:28:19 -07:00
compat Merge branch 'ma/win32-unix-domain-socket' into maint-2.45 2024-05-31 15:28:21 -07:00
contrib Merge branch 'kn/osxkeychain-skip-idempotent-store' 2024-05-28 11:17:11 -07:00
Documentation diff: let external diffs report that changes are uninteresting 2024-06-10 09:20:46 -07:00
ewah ewah: implement bitmap_is_empty() 2023-12-14 14:38:07 -08:00
git-gui Makefile(s): do not enforce "all indents must be done with tab" 2024-04-08 16:36:05 -07:00
gitk-git Makefile(s): avoid recipe prefix in conditional statements 2024-04-08 14:42:32 -07:00
gitweb Merge branch 'js/update-urls-in-doc-and-comment' into maint-2.43 2024-02-08 16:22:01 -08:00
mergetools Switch grep from non-portable BRE to portable ERE 2024-05-17 12:13:18 -07:00
negotiator cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
oss-fuzz oss-fuzz/commit-graph: set up hash algorithm 2024-05-06 22:50:50 -07:00
perl Merge branch 'js/update-urls-in-doc-and-comment' into maint-2.43 2024-02-08 16:22:01 -08:00
po Merge branch 'master' of github.com:alshopov/git-po 2024-04-29 14:50:23 +08:00
refs Merge branch 'ps/refs-without-the-repository-updates' 2024-05-30 14:15:13 -07:00
reftable Merge branch 'ps/reftable-reusable-iterator' 2024-05-30 14:15:12 -07:00
sha1 avoid SHA-1 functions deprecated in OpenSSL 3+ 2023-08-01 08:34:56 -07:00
sha1collisiondetection@855827c583
sha1dc doc: refer to internet archive 2023-11-26 10:07:06 +09:00
sha256 Merge branch 'ew/hash-with-openssl-evp' 2023-08-09 16:18:15 -07:00
t diff: let external diffs report that changes are uninteresting 2024-06-10 09:20:46 -07:00
templates Merge branch 'jp/use-diff-index-in-pre-commit-sample' into maint-2.43 2024-02-08 16:22:02 -08:00
trace2 Merge branch 'en/header-cleanup' into maint-2.43 2024-02-08 16:22:10 -08:00
xdiff
.cirrus.yml Merge branch 'cb/use-freebsd-13-2-at-cirrus-ci' 2024-02-06 14:31:22 -08:00
.clang-format clang-format: fix typo in comment 2023-11-01 12:24:19 +09:00
.editorconfig editorconfig: add Makefiles to "text files" 2024-03-23 11:42:31 -07:00
.gitattributes
.gitignore replay: introduce new builtin 2023-11-26 10:10:48 +09:00
.gitlab-ci.yml Merge branch 'jt/port-ci-whitespace-check-to-gitlab' 2024-05-15 09:52:54 -07:00
.gitmodules
.mailmap mailmap: change primary address for Linus Arver 2024-04-16 22:25:11 -07:00
.tsan-suppressions
abspath.c abspath: move related functions to abspath 2023-06-12 13:49:35 -07:00
abspath.h abspath: move related functions to abspath 2023-06-12 13:49:35 -07:00
aclocal.m4
add-interactive.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
add-interactive.h
add-patch.c add-patch: enforce only one-letter response to prompts 2024-05-22 14:46:31 -07:00
advice.c advice: add --no-advice global option 2024-05-03 10:36:59 -07:00
advice.h sequencer: allow disabling conflict advice 2024-03-18 09:28:40 -07:00
alias.c config: plug various memory leaks 2024-05-27 11:20:00 -07:00
alias.h
alloc.c
alloc.h git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
apply.c Merge branch 'rj/add-i-leak-fix' 2024-04-25 10:34:24 -07:00
apply.h
archive-tar.c use xstrncmpz() 2024-02-12 09:32:41 -08:00
archive-zip.c archive.h: remove unnecessary include 2023-12-26 12:04:31 -08:00
archive.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
archive.h archive.h: remove unnecessary include 2023-12-26 12:04:31 -08:00
attr.c Merge branch 'ps/leakfixes' 2024-06-06 12:49:23 -07:00
attr.h config: clarify memory ownership in git_config_string() 2024-05-27 11:20:00 -07:00
banned.h
base85.c
base85.h
bisect.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
bisect.h
blame.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
blame.h blame.h: remove unnecessary includes 2023-12-26 12:04:32 -08:00
blob.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
blob.h
bloom.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
bloom.h
branch.c Merge branch 'kn/ref-transaction-symref' 2024-05-20 11:20:04 -07:00
branch.h typo: replace 'commitish' with 'committish' 2024-04-11 15:14:56 -07:00
builtin.h replay: introduce new builtin 2023-11-26 10:10:48 +09:00
bulk-checkin.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
bulk-checkin.h bulk-checkin: only support blobs in index_bulk_checkin 2023-09-26 10:17:56 -07:00
bundle-uri.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
bundle-uri.h
bundle.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
bundle.h
cache-tree.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
cache-tree.h
cbtree.c
cbtree.h
chdir-notify.c
chdir-notify.h
check-builtins.sh
checkout.c checkout: clarify memory ownership in unique_tracking_name() 2024-05-27 11:19:58 -07:00
checkout.h checkout: clarify memory ownership in unique_tracking_name() 2024-05-27 11:19:58 -07:00
chunk-format.c chunk-format: drop pair_chunk_unsafe() 2023-10-09 15:55:02 -07:00
chunk-format.h chunk-format: drop pair_chunk_unsafe() 2023-10-09 15:55:02 -07:00
CODE_OF_CONDUCT.md CoC: whitespace fix 2024-01-23 10:40:10 -08:00
color.c color: add support for 12-bit RGB colors 2024-05-02 09:30:38 -07:00
color.h color: add support for 12-bit RGB colors 2024-05-02 09:30:38 -07:00
column.c column: guard against negative padding 2024-02-13 10:18:57 -08:00
column.h
combine-diff.c refs: refactor resolve_gitlink_ref() to accept a repository 2024-05-17 10:33:38 -07:00
command-list.txt replay: introduce new builtin 2023-11-26 10:10:48 +09:00
commit-graph.c refs: pass repo when peeling objects 2024-05-17 10:33:39 -07:00
commit-graph.h Merge branch 'ps/do-not-trust-commit-graph-blindly-for-existence' 2023-11-08 11:03:59 +09:00
commit-reach.c commit-reach: fix memory leak in ahead_behind() 2024-05-27 11:20:01 -07:00
commit-reach.h commit-reach(repo_get_merge_bases_many_dirty): pass on errors 2024-02-29 08:06:01 -08:00
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
commit.h Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
common-main.c repository: drop initialize_the_repository() 2024-04-18 12:30:43 -07:00
config.c Merge branch 'ps/leakfixes' 2024-06-06 12:49:23 -07:00
config.h Merge branch 'ps/leakfixes' 2024-06-06 12:49:23 -07:00
config.mak.dev
config.mak.in
config.mak.uname Merge branch 'js/build-fuzz-more-often' 2024-04-30 14:49:44 -07:00
configure.ac global: convert trivial usages of test <expr> -a/-o <expr> 2023-11-11 09:21:00 +09:00
connect.c Merge branch 'gc/config-context' 2023-07-06 11:54:48 -07:00
connect.h
connected.c object-store-ll.h: split this header out of object-store.h 2023-06-21 13:39:54 -07:00
connected.h
convert.c config: clarify memory ownership in git_config_string() 2024-05-27 11:20:00 -07:00
convert.h convert: refactor code to clarify ownership of check_roundtrip_encoding 2024-05-27 11:19:59 -07:00
copy.c Merge branch 'fixes/2.45.1/2.41' into fixes/2.45.1/2.42 2024-05-24 16:57:43 -07:00
copy.h Merge branch 'fixes/2.45.1/2.40' into fixes/2.45.1/2.41 2024-05-24 16:57:02 -07:00
COPYING
credential.c credential: add method for querying capabilities 2024-04-16 22:39:08 -07:00
credential.h credential: add method for querying capabilities 2024-04-16 22:39:08 -07:00
csum-file.c Merge branch 'ew/hash-with-openssl-evp' 2023-09-13 10:07:57 -07:00
csum-file.h
ctype.c kwset: move translation table from ctype 2023-07-05 11:41:18 -07:00
daemon.c daemon: free listen_addr before returning 2023-10-05 14:54:58 -07:00
date.c date: make DATE_MODE thread-safe 2024-04-05 15:21:14 -07:00
date.h date: make DATE_MODE thread-safe 2024-04-05 15:21:14 -07:00
decorate.c decorate: add clear_decoration() function 2023-10-05 14:54:55 -07:00
decorate.h decorate: add clear_decoration() function 2023-10-05 14:54:55 -07:00
delta-islands.c config: clarify memory ownership in git_config_string() 2024-05-27 11:20:00 -07:00
delta-islands.h
delta.h
detect-compiler
diagnose.c dir.[ch]: add 'follow_symlink' arg to 'get_dtype' 2023-10-09 15:53:13 -07:00
diagnose.h
diff-delta.c
diff-lib.c refs: refactor resolve_gitlink_ref() to accept a repository 2024-05-17 10:33:38 -07:00
diff-merges.c diff-merges: introduce '--dd' option 2023-10-09 12:47:29 -07:00
diff-merges.h
diff-no-index.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
diff.c diff: let external diffs report that changes are uninteresting 2024-06-10 09:20:46 -07:00
diff.h diff --stat: set the width defaults in a helper function 2023-09-29 15:46:06 -07:00
diffcore-break.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
diffcore-delta.c Merge branch 'en/diffcore-delta-final-line-fix' into maint-2.43 2024-02-13 14:44:48 -08:00
diffcore-order.c git-compat-util.h: remove unneccessary include of wildmatch.h 2023-06-21 13:39:54 -07:00
diffcore-pickaxe.c diff.h: remove unnecessary include of oidset.h 2023-06-21 13:39:53 -07:00
diffcore-rename.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
diffcore-rotate.c
diffcore.h
dir-iterator.c dir-iterator: support iteration in sorted order 2024-02-21 09:58:05 -08:00
dir-iterator.h dir-iterator: support iteration in sorted order 2024-02-21 09:58:05 -08:00
dir.c refs: refactor resolve_gitlink_ref() to accept a repository 2024-05-17 10:33:38 -07:00
dir.h Sync with 2.44.1 2024-04-29 20:42:30 +02:00
editor.c launch_editor: waiting message on error 2024-04-15 10:13:32 -07:00
editor.h
entry.c Sync with 2.42.2 2024-04-19 12:38:50 +02:00
entry.h wrapper: reduce scope of remove_or_warn() 2023-09-29 15:14:56 -07:00
environment.c config: clarify memory ownership in git_config_string() 2024-05-27 11:20:00 -07:00
environment.h config: clarify memory ownership in git_config_string() 2024-05-27 11:20:00 -07:00
exec-cmd.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
exec-cmd.h
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c Merge branch 'ps/leakfixes' 2024-06-06 12:49:23 -07:00
fetch-pack.h treewide: remove unnecessary includes from header files 2023-12-26 12:04:31 -08:00
fmt-merge-msg.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
fmt-merge-msg.h config: add ctx arg to config_fn_t 2023-06-28 14:06:39 -07:00
fsck.c Merge branch 'ps/leakfixes' 2024-06-06 12:49:23 -07:00
fsck.h Merge branch 'fixes/2.45.1/2.42' into fixes/2.45.1/2.43 2024-05-24 16:58:11 -07:00
fsmonitor--daemon.h fsmonitor--daemon.h: remove unnecessary includes 2023-12-26 12:04:32 -08:00
fsmonitor-ipc.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:33 -08:00
fsmonitor-ipc.h
fsmonitor-ll.h fsmonitor-ll.h: split this header out of fsmonitor.h 2023-06-21 13:39:54 -07:00
fsmonitor-path-utils.h
fsmonitor-settings.c config: clarify memory ownership in git_config_pathname() 2024-05-27 11:19:59 -07:00
fsmonitor-settings.h
fsmonitor.c fsmonitor: support case-insensitive events 2024-03-06 09:10:06 -08:00
fsmonitor.h fsmonitor-ll.h: split this header out of fsmonitor.h 2023-06-21 13:39:54 -07:00
generate-cmdlist.sh
generate-configlist.sh
generate-hooklist.sh
gettext.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
gettext.h
git-archimport.perl perl: bump the required Perl version to 5.8.1 from 5.8.0 2023-11-17 07:26:32 +09:00
git-compat-util.h Merge branch 'rs/no-openssl-compilation-fix-on-macos' 2024-04-23 11:52:38 -07:00
git-curl-compat.h remote-curl: add Transfer-Encoding header only for older curl 2024-04-10 19:24:48 +02:00
git-cvsexportcommit.perl perl: bump the required Perl version to 5.8.1 from 5.8.0 2023-11-17 07:26:32 +09:00
git-cvsimport.perl Merge branch 'js/update-urls-in-doc-and-comment' into maint-2.43 2024-02-08 16:22:01 -08:00
git-cvsserver.perl perl: bump the required Perl version to 5.8.1 from 5.8.0 2023-11-17 07:26:32 +09:00
git-difftool--helper.sh git-difftool--helper: honor --trust-exit-code with --dir-diff 2024-02-20 09:30:32 -08:00
git-filter-branch.sh
git-instaweb.sh doc: switch links to https 2023-11-26 10:07:05 +09:00
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-p4.py git-p4: show Perforce error to the user 2024-05-08 15:44:14 -07:00
git-quiltimport.sh git-quiltimport: avoid an unnecessary subshell 2024-03-16 11:08:57 -07:00
git-request-pull.sh
git-send-email.perl Merge branch 'fixes/2.45.1/2.40' into fixes/2.45.1/2.41 2024-05-24 16:57:02 -07:00
git-sh-i18n.sh
git-sh-setup.sh
git-submodule.sh
git-svn.perl Merge branch 'tz/send-email-negatable-options' into maint-2.43 2024-02-08 16:22:01 -08:00
GIT-VERSION-GEN Git 2.45.2 2024-05-30 17:18:43 -07:00
git-web--browse.sh
git-zlib.c
git-zlib.h
git.c advice: add --no-advice global option 2024-05-03 10:36:59 -07:00
git.rc
gpg-interface.c config: clarify memory ownership in git_config_string() 2024-05-27 11:20:00 -07:00
gpg-interface.h tag: fix sign_buffer() call to create a signed tag 2024-02-07 10:47:25 -08:00
graph.c diff --stat: add config option to limit filename width 2023-09-18 09:39:07 -07:00
graph.h doc: switch links to https 2023-11-26 10:07:05 +09:00
grep.c grep: improve errors for unmatched ( and ) 2024-03-25 11:40:53 -07:00
grep.h config: add ctx arg to config_fn_t 2023-06-28 14:06:39 -07:00
hash-ll.h object-names: support input of oids in any supported hash 2023-10-02 14:57:38 -07:00
hash-lookup.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
hash-lookup.h
hash.h cache: add a function to read an OID of a specific algorithm 2023-10-02 14:57:39 -07:00
hashmap.c
hashmap.h hash-ll, hashmap: move oidhash() to hash-ll 2023-06-21 13:39:54 -07:00
help.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
help.h
hex-ll.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
hex-ll.h hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
hex.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
hex.h hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
hook.c Merge branch 'fixes/2.45.1/2.41' into fixes/2.45.1/2.42 2024-05-24 16:57:43 -07:00
hook.h
http-backend.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
http-fetch.c http.h: remove unnecessary include 2023-12-26 12:04:32 -08:00
http-push.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
http-walker.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
http.c config: clarify memory ownership in git_config_string() 2024-05-27 11:20:00 -07:00
http.h http: add support for authtype and credential 2024-04-16 22:39:07 -07:00
ident.c Merge branch 'bc/ident-dot-is-no-longer-crud-letter' 2023-08-09 16:18:15 -07:00
ident.h config: add ctx arg to config_fn_t 2023-06-28 14:06:39 -07:00
imap-send.c config: clarify memory ownership in git_config_string() 2024-05-27 11:20:00 -07:00
INSTALL Sync with 2.42.2 2024-04-19 12:38:50 +02:00
iterator.h
json-writer.c
json-writer.h doc: switch links to https 2023-11-26 10:07:05 +09:00
khash.h hash-ll, hashmap: move oidhash() to hash-ll 2023-06-21 13:39:54 -07:00
kwset.c doc: switch links to https 2023-11-26 10:07:05 +09:00
kwset.h doc: switch links to https 2023-11-26 10:07:05 +09:00
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:33 -08:00
line-log.h line-log.h: remove unnecessary include 2023-12-26 12:04:32 -08:00
line-range.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
line-range.h
linear-assignment.c
linear-assignment.h
list-objects-filter-options.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
list-objects-filter-options.h list-objects-filter-options.h: remove unneccessary include 2023-06-21 13:39:53 -07:00
list-objects-filter.c oidset: refactor oidset_insert_from_set() 2024-02-14 09:39:14 -08:00
list-objects-filter.h
list-objects.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
list-objects.h
list.h doc: switch links to https 2023-11-26 10:07:05 +09:00
lockfile.c
lockfile.h lockfile: report when rollback fails 2024-03-07 12:34:13 -08:00
log-tree.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
log-tree.h format-patch: return an allocated string from log_write_email_headers() 2024-03-19 17:54:16 -07:00
loose.c loose: compatibilty short name support 2023-10-02 14:57:38 -07:00
loose.h loose: add a mapping between SHA-1 and SHA-256 for loose objects 2023-10-02 14:57:38 -07:00
ls-refs.c refs: pass repo when peeling objects 2024-05-17 10:33:39 -07:00
ls-refs.h
mailinfo.c Merge branch 'jk/mailinfo-iterative-unquote-comment' into maint-2.43 2024-02-08 16:22:03 -08:00
mailinfo.h
mailmap.c config: clarify memory ownership in git_config_string() 2024-05-27 11:20:00 -07:00
mailmap.h config: clarify memory ownership in git_config_string() 2024-05-27 11:20:00 -07:00
Makefile Merge branch 'ps/leakfixes' 2024-06-06 12:49:23 -07:00
match-trees.c tree-walk: init_tree_desc take an oid to get the hash algorithm 2023-10-02 14:57:40 -07:00
match-trees.h
mem-pool.c don't report vsnprintf(3) error as bug 2024-04-21 12:27:07 -07:00
mem-pool.h mem-pool: add mem_pool_strfmt() 2024-02-26 09:35:40 -08:00
merge-blobs.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
merge-blobs.h
merge-ll.c config: clarify memory ownership in git_config_string() 2024-05-27 11:20:00 -07:00
merge-ll.h merge options: add a conflict style member 2024-03-14 10:08:52 -07:00
merge-ort-wrappers.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
merge-ort-wrappers.h
merge-ort.c Merge branch 'pw/checkout-conflict-errorfix' 2024-04-01 13:21:33 -07:00
merge-ort.h
merge-recursive.c Merge branch 'pw/checkout-conflict-errorfix' 2024-04-01 13:21:33 -07:00
merge-recursive.h merge options: add a conflict style member 2024-03-14 10:08:52 -07:00
merge.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
merge.h merge.h: move declarations for merge.c from cache.h 2023-06-21 13:39:53 -07:00
mergesort.h
midx-write.c Merge branch 'tb/midx-write-cleanup' 2024-06-07 10:57:23 -07:00
midx.c midx: replace get_midx_rev_filename() with a generic helper 2024-05-30 13:43:52 -07:00
midx.h midx: replace get_midx_rev_filename() with a generic helper 2024-05-30 13:43:52 -07:00
name-hash.c name-hash: add index_dir_find() 2024-02-26 15:34:01 -08:00
name-hash.h name-hash: add index_dir_find() 2024-02-26 15:34:01 -08:00
notes-cache.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
notes-cache.h
notes-merge.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
notes-merge.h
notes-utils.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
notes-utils.h
notes.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
notes.h notes: move the documentation to the struct 2023-06-06 09:35:05 +09:00
object-file-convert.c object-file-convert: convert commits that embed signed tags 2023-10-02 14:57:39 -07:00
object-file-convert.h object-file-convert: stubs for converting from one object format to another 2023-10-02 14:57:38 -07:00
object-file.c refs: refactor resolve_gitlink_ref() to accept a repository 2024-05-17 10:33:38 -07:00
object-file.h
object-name.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
object-name.h object-names: support input of oids in any supported hash 2023-10-02 14:57:38 -07:00
object-store-ll.h object-file: add a compat_oid_in parameter to write_object_file_flags 2023-10-02 14:57:39 -07:00
object-store.h packfile.c: prevent overflow in load_idx() 2023-07-14 09:31:34 -07:00
object.c refs: pass repo when peeling objects 2024-05-17 10:33:39 -07:00
object.h Merge branch 'ps/refs-without-the-repository-updates' 2024-05-30 14:15:13 -07:00
oid-array.c oid-array: teach oid-array to handle multiple kinds of oids 2023-10-02 14:57:38 -07:00
oid-array.h
oidmap.c
oidmap.h read-cache*.h: move declarations for read-cache.c functions from cache.h 2023-06-21 13:39:53 -07:00
oidset.c oidset: refactor oidset_insert_from_set() 2024-02-14 09:39:14 -08:00
oidset.h oidset: refactor oidset_insert_from_set() 2024-02-14 09:39:14 -08:00
oidtree.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
oidtree.h
pack-bitmap-write.c pack-bitmap: introduce bitmap_writer_free() 2024-05-15 06:53:46 -07:00
pack-bitmap.c pack-bitmap.c: reimplement midx_bitmap_filename() with helper 2024-05-30 13:43:52 -07:00
pack-bitmap.h pack-bitmap: introduce bitmap_writer_free() 2024-05-15 06:53:46 -07:00
pack-check.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
pack-mtimes.c object-store-ll.h: split this header out of object-store.h 2023-06-21 13:39:54 -07:00
pack-mtimes.h
pack-objects.c pack-objects: free packing_data in more places 2023-12-14 14:38:07 -08:00
pack-objects.h pack-objects: free packing_data in more places 2023-12-14 14:38:07 -08:00
pack-revindex.c midx: replace get_midx_rev_filename() with a generic helper 2024-05-30 13:43:52 -07:00
pack-revindex.h pack-revindex: implement midx_pair_to_pack_pos() 2023-12-14 14:38:08 -08:00
pack-write.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
pack.h
packfile.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
packfile.h packfile.c: fix a typo in each_file_in_pack_dir_fn()'s declaration 2023-11-20 08:15:50 +09:00
pager.c config: clarify memory ownership in git_config_string() 2024-05-27 11:20:00 -07:00
pager.h
parallel-checkout.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
parallel-checkout.h
parse-options-cb.c parse-options-cb: only abbreviate hashes when hash algo is known 2024-05-06 22:50:48 -07:00
parse-options.c parse-options: rearrange long_name matching code 2024-03-03 09:49:22 -08:00
parse-options.h parse-options: make CMDMODE errors more precise 2023-10-29 09:15:18 +09:00
parse.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
parse.h parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
patch-delta.c
patch-ids.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
patch-ids.h
path.c Merge branch 'ps/undecided-is-not-necessarily-sha1' 2024-05-30 14:15:11 -07:00
path.h path: move validate_headref() to its only user 2024-05-06 22:50:48 -07:00
pathspec.c attr: enable attr pathspec magic for git-add and git-stash 2023-11-04 17:00:27 +09:00
pathspec.h Merge branch 'jk/log-follow-with-non-literal-pathspec' 2023-06-20 15:53:13 -07:00
pkt-line.c Merge branch 'jx/sideband-chomp-newline-fix' into maint-2.43 2024-02-08 16:22:11 -08:00
pkt-line.h Merge branch 'jx/sideband-chomp-newline-fix' into maint-2.43 2024-02-08 16:22:11 -08:00
preload-index.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
preload-index.h preload-index.h: move declarations for preload-index.c from elsewhere 2023-06-21 13:39:53 -07:00
pretty.c config: clarify memory ownership in git_config_string() 2024-05-27 11:20:00 -07:00
pretty.h Merge branch 'rs/date-mode-pass-by-value' 2024-04-16 14:50:29 -07:00
prio-queue.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
prio-queue.h
progress.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
progress.h
promisor-remote.c Merge branch 'th/quiet-lazy-fetch-from-promisor' 2024-06-06 12:49:24 -07:00
promisor-remote.h config: clarify memory ownership in git_config_string() 2024-05-27 11:20:00 -07:00
prompt.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
prompt.h
protocol-caps.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
protocol-caps.h
protocol.c
protocol.h doc: switch links to https 2023-11-26 10:07:05 +09:00
prune-packed.c object-store-ll.h: split this header out of object-store.h 2023-06-21 13:39:54 -07:00
prune-packed.h
quote.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
quote.h
range-diff.c Merge branch 'kh/range-diff-notes' 2023-09-29 09:04:15 -07:00
range-diff.h format-patch: run range-diff with larger creation-factor 2024-05-06 11:57:22 -07:00
reachable.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
reachable.h
read-cache-ll.h revision: optionally record matches with pathspec elements 2024-04-03 14:55:21 -07:00
read-cache.c refs: refactor resolve_gitlink_ref() to accept a repository 2024-05-17 10:33:38 -07:00
read-cache.h read-cache*.h: move declarations for read-cache.c functions from cache.h 2023-06-21 13:39:53 -07:00
README.md Merge branch 'jc/majordomo-to-subspace' into maint-2.43 2024-02-13 14:44:50 -08:00
rebase-interactive.c strbuf: accept a comment string for strbuf_add_commented_lines() 2024-03-12 13:28:10 -07:00
rebase-interactive.h
rebase.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
rebase.h
ref-filter.c Merge branch 'ps/refs-without-the-repository-updates' 2024-05-30 14:15:13 -07:00
ref-filter.h ref-filter: properly distinuish pseudo and root refs 2024-05-15 07:30:52 -07:00
reflog-walk.c refs: remove dwim_log() 2024-05-17 10:33:39 -07:00
reflog-walk.h date: make DATE_MODE thread-safe 2024-04-05 15:21:14 -07:00
reflog.c refs: remove dwim_log() 2024-05-17 10:33:39 -07:00
reflog.h
refs.c Merge branch 'ps/refs-without-the-repository-updates' 2024-05-30 14:15:13 -07:00
refs.h Merge branch 'ps/refs-without-the-repository-updates' 2024-05-30 14:15:13 -07:00
refspec.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
refspec.h
RelNotes Git 2.45.2 2024-05-30 17:18:43 -07:00
remote-curl.c Merge branch 'ps/undecided-is-not-necessarily-sha1' 2024-05-30 14:15:11 -07:00
remote.c Merge branch 'ps/leakfixes' 2024-06-06 12:49:23 -07:00
remote.h config: clarify memory ownership in git_config_string() 2024-05-27 11:20:00 -07:00
replace-object.c refs: convert iteration over replace refs to accept ref store 2024-05-17 10:33:38 -07:00
replace-object.h Merge branch 'en/header-split-cache-h-part-3' 2023-06-29 16:43:21 -07:00
repo-settings.c pack-objects: enable multi-pack reuse via feature.experimental 2024-02-05 15:27:01 -08:00
repository.c Merge branch 'jc/undecided-is-not-necessarily-sha1-fix' 2024-05-30 14:15:14 -07:00
repository.h refs: retrieve worktree ref stores via associated repository 2024-05-17 10:33:38 -07:00
rerere.c Merge branch 'mr/rerere-crash-fix' 2024-04-23 11:52:41 -07:00
rerere.h
reset.c Merge branch 'kn/ref-transaction-symref' 2024-05-20 11:20:04 -07:00
reset.h
resolve-undo.c Merge branch 'jc/unresolve-removal' 2023-10-02 11:20:00 -07:00
resolve-undo.h checkout: allow "checkout -m path" to unmerge removed paths 2023-07-31 16:16:44 -07:00
revision.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
revision.h revision: optionally record matches with pathspec elements 2024-04-03 14:55:21 -07:00
run-command.c run-command: introduce function to prepare auto-maintenance process 2024-04-17 08:42:26 -07:00
run-command.h run-command: introduce function to prepare auto-maintenance process 2024-04-17 08:42:26 -07:00
sane-ctype.h sane-ctype.h: create header for sane-ctype macros 2023-07-05 11:41:18 -07:00
scalar.c scalar: make enlistment delete to work on all POSIX platforms 2024-05-17 12:16:25 -07:00
SECURITY.md
send-pack.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
send-pack.h
sequencer.c Merge branch 'ps/leakfixes' 2024-06-06 12:49:23 -07:00
sequencer.h Merge branch 'pw/rebase-m-signoff-fix' 2024-04-30 14:49:41 -07:00
serve.c upload-pack: disallow object-info capability by default 2024-02-28 14:42:01 -08:00
serve.h
server-info.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
server-info.h
setup.c Merge branch 'ps/leakfixes' 2024-06-06 12:49:23 -07:00
setup.h Sync with 2.44.1 2024-04-29 20:42:30 +02:00
sh-i18n--envsubst.c doc: switch links to https 2023-11-26 10:07:05 +09:00
sha1dc_git.c
sha1dc_git.h
shallow.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
shallow.h
shared.mak Makefile: simplify output of the libpath_template 2024-01-31 14:43:00 -08:00
shell.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
shortlog.h
sideband.c sideband: avoid short write(2) 2024-03-02 11:12:16 -08:00
sideband.h
sigchain.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
sigchain.h
simple-ipc.h
sparse-index.c Merge branch 'jh/sparse-index-expand-to-path-fix' 2024-02-08 13:20:34 -08:00
sparse-index.h sparse-index.h: move declarations for sparse-index.c from cache.h 2023-06-21 13:39:53 -07:00
split-index.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
split-index.h
stable-qsort.c
statinfo.c Merge branch 'jc/fake-lstat' 2023-12-27 14:52:24 -08:00
statinfo.h cache: add fake_lstat() 2023-09-15 17:08:46 -07:00
strbuf.c strbuf: fix leak when appendwholeline() fails with EOF 2024-05-27 11:19:58 -07:00
strbuf.h Merge branch 'jk/core-comment-string' 2024-04-05 10:49:49 -07:00
streaming.c treewide: remove unnecessary includes for wrapper.h 2023-07-05 11:41:59 -07:00
streaming.h
string-list.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
string-list.h
strmap.c
strmap.h
strvec.c strvec: add functions to replace and remove strings 2024-05-27 11:20:02 -07:00
strvec.h strvec: add functions to replace and remove strings 2024-05-27 11:20:02 -07:00
sub-process.c
sub-process.h
submodule-config.c submodule: fix leaking memory for submodule entries 2024-05-27 11:20:01 -07:00
submodule-config.h Merge branch 'vd/fsck-submodule-url-test' 2024-01-26 08:54:47 -08:00
submodule.c refs: pass repo when retrieving submodule ref store 2024-05-17 10:33:37 -07:00
submodule.h Sync with 2.39.4 2024-04-19 12:38:37 +02:00
symlinks.c
symlinks.h
tag.c refs: pass repo when peeling objects 2024-05-17 10:33:39 -07:00
tag.h refs: pass repo when peeling objects 2024-05-17 10:33:39 -07:00
tar.h
tempfile.c lockfile: report when rollback fails 2024-03-07 12:34:13 -08:00
tempfile.h lockfile: report when rollback fails 2024-03-07 12:34:13 -08:00
thread-utils.c
thread-utils.h
tmp-objdir.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
tmp-objdir.h
trace.c doc: switch links to https 2023-11-26 10:07:05 +09:00
trace.h
trace2.c trace2: emit 'def_param' set with 'cmd_name' event 2024-03-07 10:24:34 -08:00
trace2.h trace2: fix signature of trace2_def_param() macro 2023-11-23 10:30:32 +09:00
trailer.c Merge branch 'la/hide-trailer-info' 2024-05-23 11:04:27 -07:00
trailer.h Merge branch 'la/hide-trailer-info' 2024-05-23 11:04:27 -07:00
transport-helper.c transport-helper: fix leaking helper name 2024-05-27 11:19:57 -07:00
transport-internal.h
transport.c transport-helper: fix leaking helper name 2024-05-27 11:19:57 -07:00
transport.h
tree-diff.c tree-diff: respect max_allowed_tree_depth 2023-08-31 15:51:08 -07:00
tree-walk.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
tree-walk.h Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
tree.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
tree.h read_tree(): respect max_allowed_tree_depth 2023-08-31 15:51:08 -07:00
unicode-width.h unicode: update the width tables to Unicode 15.1 2023-09-25 16:17:28 -07:00
unimplemented.sh
unix-socket.c
unix-socket.h
unix-stream-server.c
unix-stream-server.h
unpack-trees.c refs: refactor resolve_gitlink_ref() to accept a repository 2024-05-17 10:33:38 -07:00
unpack-trees.h tree-walk: drop MAX_TRAVERSE_TREES macro 2023-08-31 15:51:07 -07:00
upload-pack.c Merge branch 'ps/leakfixes' 2024-06-06 12:49:23 -07:00
upload-pack.h
url.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
url.h
urlmatch.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
urlmatch.h config: add ctx arg to config_fn_t 2023-06-28 14:06:39 -07:00
usage.c usage: report vsnprintf(3) failure 2024-04-05 15:16:27 -07:00
userdiff.c diff: let external diffs report that changes are uninteresting 2024-06-10 09:20:46 -07:00
userdiff.h diff: let external diffs report that changes are uninteresting 2024-06-10 09:20:46 -07:00
utf8.c doc: switch links to https 2023-11-26 10:07:05 +09:00
utf8.h doc: switch links to https 2023-11-26 10:07:05 +09:00
varint.c
varint.h
version.c
version.h
versioncmp.c git-compat-util: move strbuf.c funcs to its header 2023-07-05 11:41:18 -07:00
versioncmp.h
walker.c Merge branch 'kn/ref-transaction-symref' 2024-05-20 11:20:04 -07:00
walker.h
wildmatch.c
wildmatch.h
worktree.c refs: retrieve worktree ref stores via associated repository 2024-05-17 10:33:38 -07:00
worktree.h refs: retrieve worktree ref stores via associated repository 2024-05-17 10:33:38 -07:00
wrap-for-bin.sh
wrapper.c don't report vsnprintf(3) error as bug 2024-04-21 12:27:07 -07:00
wrapper.h wrapper: reduce scope of remove_or_warn() 2023-09-29 15:14:56 -07:00
write-or-die.c write-or-die: fix the polarity of GIT_FLUSH environment variable 2024-02-13 11:57:28 -08:00
write-or-die.h
ws.c Merge branch 'jc/attr-source-tree' 2023-05-17 10:11:41 -07:00
ws.h
wt-status.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
wt-status.h status: unify parsing of --untracked= and status.showUntrackedFiles 2024-03-13 10:43:32 -07:00
xdiff-interface.c xdiff-interface: refactor parsing of merge.conflictstyle 2024-03-14 10:08:52 -07:00
xdiff-interface.h xdiff-interface: refactor parsing of merge.conflictstyle 2024-03-14 10:08:52 -07:00

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 to git+subscribe@vger.kernel.org (see https://subspace.kernel.org/subscribing.html for details). The mailing list archives are available at https://lore.kernel.org/git/, https://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