Go to file
Jeff King 03763e68fb chainlint.pl: check line numbers in expected output
While working on chainlint.pl recently, we introduced some bugs that
showed incorrect line numbers in the output. But it was hard to notice,
since we sanitize the output by removing all of the line numbers! It
would be nice to retain these so we can catch any regressions.

The main reason we sanitize is for maintainability: we concatenate all
of the test snippets into a single file, so it's hard for each ".expect"
file to know at which offset its test input will be found. We can handle
that by storing the per-test line numbers in the ".expect" files, and
then dynamically offsetting them as we build the concatenated test and
expect files together.

The changes to the ".expect" files look like tedious boilerplate, but it
actually makes adding new tests easier. You can now just run:

  perl chainlint.pl chainlint/foo.test |
  tail -n +2 >chainlint/foo.expect

to save the output of the script minus the comment headers (after
checking that it is correct, of course). Whereas before you had to strip
the line numbers. The conversions here were done mechanically using
something like the script above, and then spot-checked manually.

It would be possible to do all of this in shell via the Makefile, but it
gets a bit complicated (and requires a lot of extra processes). Instead,
I've written a short perl script that generates the concatenated files
(we already depend on perl, since chainlint.pl uses it). Incidentally,
this improves a few other things:

  - we incorrectly used $(CHAINLINTTMP_SQ) inside a double-quoted
    string. So if your test directory required quoting, like:

       make "TEST_OUTPUT_DIRECTORY=/tmp/h'orrible"

    we'd fail the chainlint tests.

  - the shell in the Makefile didn't handle &&-chaining correctly in its
    loops (though in practice the "sed" and "cat" invocations are not
    likely to fail).

  - likewise, the sed invocation to strip numbers was hiding the exit
    code of chainlint.pl itself. In practice this isn't a big deal;
    since there are linter violations in the test files, we expect it to
    exit non-zero. But we could later use exit codes to distinguish
    serious errors from expected ones.

  - we now use a constant number of processes, instead of scaling with
    the number of test scripts. So it should be a little faster (on my
    machine, "make check-chainlint" goes from 133ms to 73ms).

There are some alternatives to this approach, but I think this is still
a good intermediate step:

  1. We could invoke chainlint.pl individually on each test file, and
     compare it to the expected output (and possibly using "make" to
     avoid repeating already-done checks). This is a much bigger change
     (and we'd have to figure out what to do with the "# LINT" lines in
     the inputs). But in this case we'd still want the "expect" files to
     be annotated with line numbers. So most of what's in this patch
     would be needed anyway.

  2. Likewise, we could run a single chainlint.pl and feed it all of the
     scripts (with "--jobs=1" to get deterministic output). But we'd
     still need to annotate the scripts as we did here, and we'd still
     need to either assemble the "expect" file, or break apart the
     script output to compare to each individual ".expect" file.

So we may pursue those in the long run, but this patch gives us more
robust tests without too much extra work or moving in a useless
direction.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-07-10 10:14:22 -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
Documentation Sync with 'maint' 2024-06-28 16:03:59 -07:00
block-sha1
builtin Merge branch 'rs/difftool-env-simplify' into maint-2.45 2024-06-28 15:53:16 -07:00
ci Merge branch 'ps/ci-fix-detection-of-ubuntu-20' into maint-2.45 2024-06-28 15:53:17 -07:00
compat Merge branch 'js/mingw-remove-unused-extern-decl' 2024-06-27 09:19:58 -07:00
contrib Merge branch 'kn/osxkeychain-skip-idempotent-store' 2024-05-28 11:17:11 -07:00
ewah ewah: `bitmap_equals_ewah()` 2024-05-24 11:40:44 -07: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 'kn/update-ref-symref' 2024-06-20 15:45:12 -07:00
reftable Merge branch 'ps/no-writable-strings' 2024-06-17 15:55:58 -07:00
sha1
sha1collisiondetection@855827c583
sha1dc doc: refer to internet archive 2023-11-26 10:07:06 +09:00
sha256
t chainlint.pl: check line numbers in expected output 2024-07-10 10:14:22 -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
.editorconfig editorconfig: add Makefiles to "text files" 2024-03-23 11:42:31 -07:00
.gitattributes
.gitignore builtin/refs: new command to migrate ref storage formats 2024-06-06 09:04:34 -07:00
.gitlab-ci.yml gitlab-ci: add job to run `make check-docs` 2024-06-06 08:20:51 -07:00
.gitmodules
.mailmap mailmap: change primary address for Linus Arver 2024-04-16 22:25:11 -07:00
.tsan-suppressions
CODE_OF_CONDUCT.md CoC: whitespace fix 2024-01-23 10:40:10 -08:00
COPYING
GIT-VERSION-GEN Git 2.45.2 2024-05-30 17:18:43 -07:00
INSTALL Sync with 2.42.2 2024-04-19 12:38:50 +02:00
LGPL-2.1
Makefile Merge branch 'tb/pseudo-merge-reachability-bitmap' 2024-06-24 16:39:13 -07:00
README.md Merge branch 'jc/majordomo-to-subspace' into maint-2.43 2024-02-13 14:44:50 -08:00
RelNotes More post 2.45.2 updates from the 'master' front 2024-06-28 15:53:19 -07:00
SECURITY.md
abspath.c
abspath.h
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 Merge branch 'jc/varargs-attributes' 2024-06-17 15:55:55 -07:00
advice.c Merge branch 'pw/rebase-i-error-message' 2024-06-20 15:45:15 -07:00
advice.h rebase -i: improve error message when picking merge 2024-05-30 10:02:58 -07:00
alias.c config: plug various memory leaks 2024-05-27 11:20:00 -07:00
alias.h
alloc.c
alloc.h
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 'tb/attr-limits' into maint-2.45 2024-06-28 15:53:10 -07:00
attr.h Merge branch 'jc/varargs-attributes' 2024-06-17 15:55:55 -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' into kn/update-ref-symref 2024-05-23 09:38:59 -07:00
branch.h typo: replace 'commitish' with 'committish' 2024-04-11 15:14:56 -07:00
builtin.h builtin/refs: new command to migrate ref storage formats 2024-06-06 09:04:34 -07:00
bulk-checkin.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
bulk-checkin.h
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.h
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 builtin/refs: new command to migrate ref storage formats 2024-06-06 09:04:34 -07:00
commit-graph.c Merge branch 'ds/ahead-behind-fix' into maint-2.45 2024-06-28 15:53:19 -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 Merge branch 'rs/remove-unused-find-header-mem' 2024-06-27 09:19:59 -07:00
commit.h Merge branch 'rs/remove-unused-find-header-mem' 2024-06-27 09:19:59 -07:00
common-main.c repository: drop `initialize_the_repository()` 2024-04-18 12:30:43 -07:00
config.c Merge branch 'tb/pseudo-merge-reachability-bitmap' 2024-06-24 16:39:13 -07:00
config.h Merge branch 'tb/pseudo-merge-reachability-bitmap' 2024-06-24 16:39:13 -07:00
config.mak.dev config.mak.dev: enable `-Wwrite-strings` warning 2024-06-07 10:30:56 -07:00
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 refs: call branches branches 2024-06-04 15:07:08 -07:00
connect.h
connected.c
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
credential.c credential: clear expired c->credential, unify secret clearing 2024-06-06 11:42:40 -07:00
credential.h credential: clear expired c->credential, unify secret clearing 2024-06-06 11:42:40 -07:00
csum-file.c
csum-file.h
ctype.c
daemon.c
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.h t/: migrate helper/test-example-decorate to the unit testing framework 2024-05-28 13:53:36 -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
diagnose.h
diff-delta.c
diff-lib.c Merge branch 'rs/diff-parseopts-cleanup' into maint-2.45 2024-06-28 15:53:10 -07:00
diff-merges.c
diff-merges.h
diff-no-index.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
diff.c Merge branch 'rs/diff-exit-code-with-external-diff' 2024-06-20 15:45:08 -07:00
diff.h
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
diffcore-pickaxe.c
diffcore-rename.c global: improve const correctness when assigning string constants 2024-06-07 10:30:48 -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 Merge branch 'jk/cap-exclude-file-size' into maint-2.45 2024-06-28 15:53:17 -07:00
dir.h dir.c: always copy input to add_pattern() 2024-06-05 09:51:42 -07:00
editor.c launch_editor: waiting message on error 2024-04-15 10:13:32 -07:00
editor.h
entry.c entry: refactor how we remove items for delayed checkouts 2024-06-07 10:30:51 -07:00
entry.h
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 'dg/fetch-pack-code-cleanup' into maint-2.45 2024-06-28 15:53:13 -07:00
fetch-pack.h treewide: remove unnecessary includes from header files 2023-12-26 12:04:31 -08:00
fmt-merge-msg.c global: improve const correctness when assigning string constants 2024-06-07 10:30:48 -07:00
fmt-merge-msg.h
fsck.c Merge branch 'ps/no-writable-strings' 2024-06-17 15:55:58 -07:00
fsck.h Merge branch 'ps/no-writable-strings' 2024-06-17 15:55:58 -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-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
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-web--browse.sh
git-zlib.c
git-zlib.h
git.c builtin/refs: new command to migrate ref storage formats 2024-06-06 09:04:34 -07:00
git.rc
gpg-interface.c global: convert intentionally-leaking config strings to consts 2024-06-07 10:30:48 -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
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
hash-ll.h
hash-lookup.c
hash-lookup.h
hash.h
hashmap.c
hashmap.h
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.h
hex.c
hex.h
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 __attribute__: mark some functions with LAST_ARG_MUST_BE_NULL 2024-06-10 09:16:30 -07:00
http-backend.c global: improve const correctness when assigning string constants 2024-06-07 10:30:48 -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 http: do not assign string constant to non-const field 2024-06-07 10:30:53 -07:00
http.h http: add support for authtype and credential 2024-04-16 22:39:07 -07:00
ident.c ident: add casts for fallback name and GECOS 2024-06-07 10:30:51 -07:00
ident.h
imap-send.c Merge branch 'ps/no-writable-strings' 2024-06-17 15:55:58 -07:00
iterator.h
json-writer.c strbuf: introduce strbuf_addstrings() to repeatedly add a string 2024-05-29 09:09:39 -07:00
json-writer.h doc: switch links to https 2023-11-26 10:07:05 +09:00
khash.h
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
line-log.c line-log: always allocate the output prefix 2024-06-07 10:30:51 -07: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.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 format-patch: move range/inter diff at the end of a single patch output 2024-05-24 16:26:57 -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.h
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 mailmap: always store allocated strings in mailmap blob 2024-06-07 10:30:54 -07:00
mailmap.h config: clarify memory ownership in `git_config_string()` 2024-05-27 11:20:00 -07:00
match-trees.c
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 __attribute__: add a few missing format attributes 2024-06-10 09:16:30 -07: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 global: convert intentionally-leaking config strings to consts 2024-06-07 10:30:48 -07:00
merge-ll.h merge options: add a conflict style member 2024-03-14 10:08:52 -07:00
merge-ort-wrappers.c
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
mergesort.h
midx-write.c Merge branch 'tb/pseudo-merge-reachability-bitmap' 2024-06-24 16:39:13 -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
object-file-convert.c
object-file-convert.h
object-file.c Merge branch 'ps/no-writable-strings' 2024-06-17 15:55:58 -07:00
object-file.h
object-name.c object-name: don't try to abbreviate to lengths greater than hexsz 2024-06-12 12:57:18 -07:00
object-name.h
object-store-ll.h
object-store.h
object.c refs: pass repo when peeling objects 2024-05-17 10:33:39 -07:00
object.h Merge branch 'tb/pseudo-merge-reachability-bitmap' 2024-06-24 16:39:13 -07:00
oid-array.c
oid-array.h
oidmap.c
oidmap.h
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
oidtree.h
pack-bitmap-write.c pseudo-merge: implement support for finding existing merges 2024-05-24 11:40:44 -07:00
pack-bitmap.c Merge branch 'tb/pseudo-merge-reachability-bitmap' 2024-06-24 16:39:13 -07:00
pack-bitmap.h pseudo-merge: implement support for finding existing merges 2024-05-24 11:40:44 -07:00
pack-check.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
pack-mtimes.c
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 pack-revindex.c: guard against out-of-bounds pack lookups 2024-06-11 16:08:28 -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
parallel-checkout.h
parse-options-cb.c parse-options-cb: stop clamping "--abbrev=" to hash length 2024-06-12 12:57:18 -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: cast long name for OPTION_ALIAS 2024-06-07 10:30:53 -07:00
parse.c config: introduce `git_config_double()` 2024-05-24 11:40:42 -07:00
parse.h config: introduce `git_config_double()` 2024-05-24 11:40:42 -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 Merge branch 'jc/worktree-git-path' 2024-06-24 16:39:15 -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
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
preload-index.h
pretty.c pretty: add casts for decoration option pointers 2024-06-07 10:30:52 -07:00
pretty.h Merge branch 'rs/date-mode-pass-by-value' 2024-04-16 14:50:29 -07:00
prio-queue.c
prio-queue.h
progress.c
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
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
prune-packed.h
pseudo-merge.c Merge branch 'tb/pseudo-merge-reachability-bitmap' 2024-06-24 16:39:13 -07:00
pseudo-merge.h pseudo-merge: implement support for finding existing merges 2024-05-24 11:40:44 -07:00
quote.c
quote.h
range-diff.c
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
rebase-interactive.c rebase -i: pass struct replay_opts to parse_insn_line() 2024-05-30 10:02:56 -07:00
rebase-interactive.h rebase -i: pass struct replay_opts to parse_insn_line() 2024-05-30 10:02:56 -07:00
rebase.c
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 'kn/update-ref-symref' 2024-06-20 15:45:12 -07:00
refs.h Merge branch 'kn/update-ref-symref' 2024-06-20 15:45:12 -07:00
refspec.c refspec: remove global tag refspec structure 2024-06-07 10:30:49 -07:00
refspec.h refspec: remove global tag refspec structure 2024-06-07 10:30:49 -07:00
remote-curl.c Merge branch 'ps/no-writable-strings' 2024-06-17 15:55:58 -07:00
remote.c Merge branch 'ps/no-writable-strings' into jk/imap-send-plug-all-msgs-leak 2024-06-07 10:32:02 -07:00
remote.h Merge branch 'jc/heads-are-branches' 2024-06-20 15:45:17 -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
repo-settings.c pack-objects: enable multi-pack reuse via `feature.experimental` 2024-02-05 15:27:01 -08:00
repository.c Merge branch 'ps/ref-storage-migration' 2024-06-17 15:55:55 -07:00
repository.h refs: convert ref storage format to an enum 2024-06-06 09:04:31 -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
resolve-undo.h
revision.c Merge branch 'jc/worktree-git-path' 2024-06-24 16:39:15 -07:00
revision.h revision: optionally record matches with pathspec elements 2024-04-03 14:55:21 -07:00
run-command.c Merge branch 'ps/no-writable-strings' 2024-06-17 15:55:58 -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
scalar.c Merge branch 'jc/varargs-attributes' into maint-2.45 2024-06-28 15:53:18 -07:00
send-pack.c send-pack: always allocate receive status 2024-06-07 10:30:53 -07:00
send-pack.h
sequencer.c Merge branch 'pw/rebase-m-signoff-fix' into maint-2.45 2024-06-28 15:53:06 -07:00
sequencer.h Merge branch 'pw/rebase-m-signoff-fix' into maint-2.45 2024-06-28 15:53:06 -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 server-info.c: remove temporary info files on exit 2024-06-07 08:40:50 -07:00
server-info.h
setup.c Merge branch 'jc/safe-directory-leading-path' into maint-2.45 2024-06-28 15:53:17 -07:00
setup.h refs: convert ref storage format to an enum 2024-06-06 09:04:31 -07: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
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
split-index.c
split-index.h
stable-qsort.c
statinfo.c Merge branch 'jc/fake-lstat' 2023-12-27 14:52:24 -08:00
statinfo.h
strbuf.c Merge branch 'gt/t-hash-unit-test' 2024-06-12 13:37:15 -07:00
strbuf.h strbuf: introduce strbuf_addstrings() to repeatedly add a string 2024-05-29 09:09:39 -07:00
streaming.c
streaming.h
string-list.c
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 __attribute__: trace2_region_enter_printf() is like "printf" 2024-06-10 09:16:19 -07:00
trailer.c global: improve const correctness when assigning string constants 2024-06-07 10:30:48 -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-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
unicode-width.h
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
upload-pack.c Merge branch 'ps/no-writable-strings' into jk/imap-send-plug-all-msgs-leak 2024-06-07 10:32:02 -07:00
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c usage: report vsnprintf(3) failure 2024-04-05 15:16:27 -07:00
userdiff.c Merge branch 'rs/diff-exit-code-with-external-diff' 2024-06-20 15:45:08 -07:00
userdiff.h Merge branch 'rs/diff-exit-code-with-external-diff' 2024-06-20 15:45:08 -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
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 worktree: don't store main worktree twice 2024-06-06 09:04:33 -07:00
worktree.h Merge branch 'jc/worktree-git-path' 2024-06-24 16:39:15 -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
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
ws.h
wt-status.c Merge branch 'ps/no-writable-strings' 2024-06-17 15:55:58 -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