summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/.gitignore1
-rw-r--r--Documentation/Makefile67
-rw-r--r--Documentation/RelNotes/2.34.0.txt38
-rw-r--r--Documentation/config/color.txt2
-rw-r--r--Documentation/config/gpg.txt43
-rw-r--r--Documentation/config/user.txt7
-rwxr-xr-xDocumentation/lint-gitlink.perl10
-rwxr-xr-xDocumentation/lint-man-end-blurb.perl2
-rwxr-xr-xDocumentation/lint-man-section-order.perl2
-rw-r--r--Documentation/technical/signature-format.txt24
-rw-r--r--Makefile2
-rw-r--r--builtin/blame.c3
-rw-r--r--builtin/checkout--worker.c4
-rw-r--r--builtin/commit-graph.c4
-rw-r--r--builtin/fast-export.c2
-rw-r--r--builtin/fsck.c44
-rw-r--r--builtin/index-pack.c2
-rw-r--r--builtin/ls-files.c14
-rw-r--r--builtin/merge.c2
-rw-r--r--builtin/mktag.c3
-rw-r--r--builtin/receive-pack.c4
-rw-r--r--builtin/send-pack.c4
-rw-r--r--builtin/shortlog.c3
-rw-r--r--cache-tree.c42
-rw-r--r--cache.h46
-rw-r--r--daemon.c2
-rw-r--r--fmt-merge-msg.c12
-rw-r--r--gpg-interface.c585
-rw-r--r--gpg-interface.h8
-rw-r--r--log-tree.c8
-rw-r--r--merge-ort.c18
-rw-r--r--merge-recursive.c41
-rw-r--r--mergetools/xxdiff7
-rw-r--r--midx.c42
-rw-r--r--object-file.c205
-rw-r--r--object-store.h17
-rw-r--r--object.c4
-rw-r--r--pack-check.c3
-rw-r--r--parallel-checkout.c3
-rw-r--r--parse-options.c87
-rw-r--r--parse-options.h26
-rw-r--r--pkt-line.c45
-rw-r--r--pkt-line.h10
-rw-r--r--pretty.c4
-rw-r--r--read-cache.c2
-rw-r--r--refs.c32
-rw-r--r--refs/files-backend.c16
-rw-r--r--refs/packed-backend.c13
-rw-r--r--refs/packed-backend.h4
-rw-r--r--refs/ref-cache.c10
-rw-r--r--refs/ref-cache.h1
-rw-r--r--refs/refs-internal.h11
-rw-r--r--remote-curl.c2
-rw-r--r--send-pack.c8
-rw-r--r--sequencer.c36
-rw-r--r--strbuf.c12
-rw-r--r--strbuf.h6
-rw-r--r--streaming.c27
-rw-r--r--submodule.c18
-rw-r--r--t/.gitattributes1
-rw-r--r--t/README7
-rw-r--r--t/helper/test-oid-array.c4
-rw-r--r--t/helper/test-oidtree.c3
-rw-r--r--t/helper/test-parse-options.c7
-rw-r--r--t/helper/test-prio-queue.c2
-rw-r--r--t/lib-diff-data.sh22
-rw-r--r--t/lib-diff.sh2
-rw-r--r--t/lib-diff/COPYING361
-rw-r--r--t/lib-diff/README46
-rw-r--r--t/lib-gpg.sh28
-rw-r--r--t/lib-httpd.sh1
-rw-r--r--t/lib-httpd/apache.conf4
-rw-r--r--t/lib-httpd/error-no-report.sh6
-rw-r--r--t/oid-info/oid2
-rw-r--r--t/perf/config2
-rw-r--r--t/perf/perf-lib.sh5
-rwxr-xr-xt/t0001-init.sh1
-rwxr-xr-xt/t0002-gitfile.sh1
-rwxr-xr-xt/t0003-attributes.sh1
-rwxr-xr-xt/t0004-unwritable.sh47
-rwxr-xr-xt/t0005-signals.sh2
-rwxr-xr-xt/t0007-git-var.sh2
-rwxr-xr-xt/t0008-ignores.sh1
-rwxr-xr-xt/t0009-prio-queue.sh2
-rwxr-xr-xt/t0010-racy-git.sh1
-rwxr-xr-xt/t0013-sha1dc.sh2
-rwxr-xr-xt/t0022-crlf-rename.sh1
-rwxr-xr-xt/t0024-crlf-archive.sh1
-rwxr-xr-xt/t0025-crlf-renormalize.sh1
-rwxr-xr-xt/t0026-eol-config.sh1
-rwxr-xr-xt/t0029-core-unsetenvvars.sh1
-rwxr-xr-xt/t0040-parse-options.sh43
-rwxr-xr-xt/t0052-simple-ipc.sh1
-rwxr-xr-xt/t0055-beyond-symlinks.sh1
-rwxr-xr-xt/t0061-run-command.sh1
-rwxr-xr-xt/t0064-oid-array.sh2
-rwxr-xr-xt/t0065-strcmp-offset.sh1
-rwxr-xr-xt/t0066-dir-iterator.sh1
-rwxr-xr-xt/t0067-parse_pathspec_file.sh1
-rwxr-xr-xt/t0069-oidtree.sh1
-rwxr-xr-xt/t0210-trace2-normal.sh2
-rwxr-xr-xt/t0211-trace2-perf.sh2
-rwxr-xr-xt/t0212-trace2-event.sh2
-rwxr-xr-xt/t1000-read-tree-m-3way.sh2
-rwxr-xr-xt/t1001-read-tree-m-2way.sh2
-rwxr-xr-xt/t1003-read-tree-prefix.sh1
-rwxr-xr-xt/t1006-cat-file.sh228
-rwxr-xr-xt/t1009-read-tree-new-index.sh1
-rwxr-xr-xt/t1010-mktree.sh1
-rwxr-xr-xt/t1012-read-tree-df.sh1
-rwxr-xr-xt/t1014-read-tree-confusing.sh2
-rwxr-xr-xt/t1092-sparse-checkout-compatibility.sh2
-rwxr-xr-xt/t1100-commit-tree-options.sh1
-rwxr-xr-xt/t1430-bad-ref-name.sh1
-rwxr-xr-xt/t1450-fsck.sh97
-rwxr-xr-xt/t1504-ceiling-dirs.sh2
-rwxr-xr-xt/t1510-repo-setup.sh1
-rwxr-xr-xt/t2002-checkout-cache-u.sh1
-rwxr-xr-xt/t2003-checkout-cache-mkdir.sh1
-rwxr-xr-xt/t2004-checkout-cache-temp.sh1
-rwxr-xr-xt/t2005-checkout-index-symlinks.sh1
-rwxr-xr-xt/t2050-git-dir-relative.sh1
-rwxr-xr-xt/t2081-parallel-checkout-collisions.sh1
-rwxr-xr-xt/t2200-add-update.sh3
-rwxr-xr-xt/t2300-cd-to-toplevel.sh1
-rwxr-xr-xt/t3000-ls-files-others.sh2
-rwxr-xr-xt/t3001-ls-files-others-exclude.sh5
-rwxr-xr-xt/t3002-ls-files-dashpath.sh2
-rwxr-xr-xt/t3003-ls-files-exclude.sh2
-rwxr-xr-xt/t3004-ls-files-basic.sh1
-rwxr-xr-xt/t3005-ls-files-relative.sh1
-rwxr-xr-xt/t3006-ls-files-long.sh2
-rwxr-xr-x