aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
AgeCommit message (Expand)AuthorFilesLines
2022-11-07Makefile & test-tool: replace "DC_SHA1" variable with a "define"Ævar Arnfjörð Bjarmason1-2/+0
2022-11-02spatchcache: add a ccache-alike for "spatch"Ævar Arnfjörð Bjarmason2-0/+324
2022-11-02cocci: run against a generated ALL.cocciÆvar Arnfjörð Bjarmason1-0/+13
2022-11-02cocci rules: remove <id>'s from rules that don't need themÆvar Arnfjörð Bjarmason4-4/+4
2022-11-02cocci: optimistically use COMPUTE_HEADER_DEPENDENCIESÆvar Arnfjörð Bjarmason1-0/+16
2022-11-02cocci: make "coccicheck" rule incrementalÆvar Arnfjörð Bjarmason1-1/+1
2022-11-02cocci rules: remove unused "F" metavariable from pending ruleÆvar Arnfjörð Bjarmason1-1/+0
2022-10-30Merge branch 'pb/subtree-split-and-merge-after-squashing-tag-fix'Taylor Blau3-69/+184
2022-10-27Merge branch 'js/cmake-updates'Junio C Hamano1-8/+8
2022-10-21subtree: fix split after annotated tag was squashed mergedPhilippe Blain3-9/+36
2022-10-21subtree: fix squash merging after annotated tag was squashed mergedPhilippe Blain3-15/+86
2022-10-21subtree: process 'git-subtree-split' trailer in separate functionPhilippe Blain1-4/+11
2022-10-21subtree: use named variables instead of "$@" in cmd_pullPhilippe Blain1-2/+4
2022-10-21subtree: define a variable before its first use in 'find_latest_squash'Philippe Blain1-1/+1
2022-10-21subtree: prefix die messages with 'fatal'Philippe Blain2-36/+36
2022-10-21subtree: add 'die_incompatible_opt' function to reduce duplicationPhilippe Blain1-12/+20
2022-10-21subtree: use 'git rev-parse --verify [--quiet]' for better error messagesPhilippe Blain1-3/+3
2022-10-19cmake: increase time-out for a long-running testJohannes Schindelin1-0/+4
2022-10-19cmake: avoid editing t/test-lib.shJohannes Schindelin1-6/+1
2022-10-19cmake: copy the merge tools for testingJohannes Schindelin1-1/+2
2022-10-19cmake: make it easier to diagnose regressions in CTest runsJohannes Schindelin1-1/+1
2022-10-17Merge branch 'ed/fsmonitor-on-networked-macos'Junio C Hamano1-0/+4
2022-10-05fsmonitor: relocate socket file if .git directory is remoteEric DeCosta1-0/+2
2022-10-05fsmonitor: refactor filesystem checks to common interfaceEric DeCosta1-0/+2
2022-09-22osxkeychain: clarify that we ignore unknown linesMatthew John Cheetham1-0/+5
2022-09-22netrc: ignore unknown lines (do not die)Matthew John Cheetham1-1/+4
2022-09-22wincred: ignore unknown lines (do not die)Matthew John Cheetham1-2/+5
2022-09-21t/Makefile: remove 'test-results' on 'make clean'SZEDER Gábor1-0/+1
2022-09-19Merge branch 'vd/scalar-to-main'Junio C Hamano7-1409/+6
2022-09-02scalar: include in standard Git build & installationVictoria Dye7-1409/+6
2022-09-02scalar: fix command documentation section headerVictoria Dye1-2/+2
2022-09-01test-lib: replace chainlint.sed with chainlint.plEric Sunshine1-1/+1
2022-08-29Merge branch 'jd/prompt-show-conflict'Junio C Hamano1-1/+11
2022-08-29Merge branch 'vd/scalar-enables-fsmonitor'Junio C Hamano2-84/+210
2022-08-25Merge branch 'vd/scalar-generalize-diagnose'Junio C Hamano2-269/+10
2022-08-19git-prompt: show presence of unresolved conflicts at command promptJustin Donnelly1-1/+11
2022-08-18scalar unregister: stop FSMonitor daemonJohannes Schindelin1-0/+13
2022-08-18scalar: enable built-in FSMonitor on `register`Matthew John Cheetham2-0/+38
2022-08-18scalar: move config setting logic into its own functionVictoria Dye1-16/+28
2022-08-18scalar-delete: do not 'die()' in 'delete_enlistment()'Victoria Dye1-4/+7
2022-08-18scalar-[un]register: clearly indicate source of errorVictoria Dye1-8/+9
2022-08-18scalar-unregister: handle error codes greater than 0Victoria Dye1-2/+2
2022-08-18scalar: constrain enlistment searchVictoria Dye2-54/+113
2022-08-12scalar-diagnose: use 'git diagnose --mode=all'Victoria Dye1-22/+6
2022-08-12diagnose.c: add option to configure archive contentsVictoria Dye1-1/+1
2022-08-12scalar-diagnose: move functionality to common locationVictoria Dye1-200/+2
2022-08-12scalar-diagnose: move 'get_disk_info()' to 'compat/'Victoria Dye1-52/+1
2022-08-12scalar-diagnose: add directory to archiver more gentlyVictoria Dye1-2/+8
2022-08-12scalar-diagnose: avoid 32-bit overflow of size_tVictoria Dye1-1/+1
2022-08-12scalar-diagnose: use "$GIT_UNZIP" in testVictoria Dye1-4/+4
2022-08-12Merge branch 'ab/leak-check'Junio C Hamano3-16/+6
2022-08-10Merge branch 'cl/rerere-train-with-no-sign' into maintJunio C Hamano1-1/+1
2022-08-08Merge branch 'ca/unignore-local-installation-on-windows'Junio C Hamano1-1/+1
2022-08-05Merge branch 'ld/osx-keychain-usage-fix' into maintJunio C Hamano1-1/+1
2022-08-01Merge branch 'cl/rerere-train-with-no-sign'Junio C Hamano1-1/+1
2022-07-27test-lib: simplify by removing test_externalÆvar Arnfjörð Bjarmason1-5/+2
2022-07-27tests: move copy/pasted PERL + Test::More checks to a lib-perl.shÆvar Arnfjörð Bjarmason1-9/+2
2022-07-27t/Makefile: don't remove test-results in "clean-except-prove-cache"Ævar Arnfjörð Bjarmason2-2/+2
2022-07-27Merge branch 'ld/osx-keychain-usage-fix'Junio C Hamano1-1/+1
2022-07-27Merge branch 'vd/scalar-doc'Junio C Hamano2-87/+4
2022-07-27cmake: support local installations of gitCarlo Marcelo Arenas Belón1-1/+1
2022-07-19Merge branch 'rs/cocci-array-copy'Junio C Hamano1-42/+40
2022-07-19osx-keychain: fix compiler warningLessley Dennington1-1/+1
2022-07-19contrib/rerere-train: avoid useless gpg sign in trainingCeleste Liu1-1/+1
2022-07-18Merge branch 'ab/cocci-unused'Junio C Hamano6-2/+191
2022-07-18scalar: convert README.md into a technical design docVictoria Dye1-82/+0
2022-07-18scalar: reword command documentation to clarify purposeVictoria Dye1-5/+4
2022-07-14Merge branch 'ab/submodule-cleanup'Junio C Hamano1-3/+12
2022-07-10cocci: avoid normalization rules for memcpyRené Scharfe1-42/+40
2022-07-06cocci: generalize "unused" rule to cover more than "strbuf"Ævar Arnfjörð Bjarmason3-4/+57
2022-07-06cocci: add and apply a rule to find "unused" strbufsÆvar Arnfjörð Bjarmason4-2/+118
2022-07-06cocci: add a "coccicheck-test" target and test *.cocci rulesÆvar Arnfjörð Bjarmason2-0/+20
2022-06-28git-sh-setup.sh: remove "say" function, change last usersÆvar Arnfjörð Bjarmason1-3/+12
2022-06-27vscode: improve tab size and wrappingDerrick Stolee1-2/+6
2022-06-21Merge branch 'jp/prompt-clear-before-upstream-mark'Junio C Hamano1-15/+17
2022-06-17Merge branch 'jc/cocci-cleanup'Junio C Hamano1-12/+0
2022-06-10Merge branch 'jh/builtin-fsmonitor-part3'Junio C Hamano1-0/+8
2022-06-10git-prompt: fix expansion of branch colour codesJoakim Petersen1-6/+6
2022-06-07cocci: retire is_null_sha1() ruleJunio C Hamano1-12/+0
2022-06-07Merge branch 'js/scalar-diagnose'Junio C Hamano3-2/+329
2022-06-07Merge branch 'ab/plug-leak-in-revisions'Junio C Hamano1-0/+27
2022-06-07Merge branch 'yw/cmake-updates'Junio C Hamano1-4/+18
2022-06-07git-prompt: make colourization consistentJoakim Petersen1-10/+12
2022-05-30scalar: teach `diagnose` to gather loose objects informationMatthew John Cheetham2-1/+63
2022-05-30scalar: teach `diagnose` to gather packfile infoMatthew John Cheetham2-1/+35
2022-05-30scalar diagnose: include disk space informationJohannes Schindelin2-0/+54
2022-05-30scalar: implement `scalar diagnose`Johannes Schindelin3-0/+170
2022-05-30scalar: validate the optional enlistment argumentJohannes Schindelin2-2/+9
2022-05-26fsmonitor--daemon: stub in health threadJeff Hostetler1-0/+2
2022-05-26fsmonitor-settings: stub in macOS-specific incompatibility checkingJeff Hostetler1-0/+3
2022-05-26fsmonitor-settings: stub in Win32-specific incompatibility checkingJeff Hostetler1-0/+3
2022-05-24cmake: remove (_)UNICODE def on Windows in CMakeLists.txtYuyi Wang1-1/+1
2022-05-24cmake: add pcre2 supportYuyi Wang1-1/+15
2022-05-24cmake: fix CMakeLists.txt on LinuxYuyi Wang1-2/+2
2022-05-20Merge branch 'ep/maint-equals-null-cocci'Junio C Hamano1-0/+30
2022-05-20Merge branch 'cg/vscode-with-gdb'Junio C Hamano2-2/+5
2022-05-10Merge branch 'ab/misc-cleanup'Junio C Hamano1-15/+0
2022-05-02Merge branch 'ep/maint-equals-null-cocci' for maint-2.35Junio C Hamano1-0/+30
2022-05-02contrib/coccinnelle: add equals-null.cocciElia Pinto1-0/+30
2022-04-30cocci: drop bogus xstrdup_or_null() ruleJunio C Hamano1-8/+0
2022-04-13cocci: add and apply free_commit_list() rulesÆvar Arnfjörð Bjarmason1-0/+27
2022-04-08contrib/vscode/: debugging with VS Code and gdbCOGONI Guillaume2-2/+5
2022-04-06Merge branch 'ab/make-optim-noop'Junio C Hamano1-1/+1
2022-04-06contrib/scalar: fix 'all' target in MakefileVictoria Dye1-1/+1
2022-04-04Merge branch 'jh/builtin-fsmonitor-part2'Junio C Hamano1-0/+10
2022-04-04Merge branch 'tl/ls-tree-oid-only'Junio C Hamano1-3/+3
2022-04-01object-store.h: remove unused has_sha1_file*()Ævar Arnfjörð Bjarmason1-15/+0
2022-03-30Merge branch 'jd/prompt-upstream-mark'Junio C Hamano1-29/+30
2022-03-30Merge branch 'vd/stash-silence-reset'Junio C Hamano1-1/+0
2022-03-25Merge branch 'ns/core-fsyncmethod'Junio C Hamano1-4/+12
2022-03-25compat/fsmonitor/fsm-listen-darwin: stub in backend for DarwinJeff Hostetler1-0/+3
2022-03-25compat/fsmonitor/fsm-listen-win32: stub in backend for WindowsJeff Hostetler1-0/+7
2022-03-23reset: remove 'reset.quiet' config optionVictoria Dye1-1/+0
2022-03-23git-prompt: put upstream comments togetherJustin Donnelly1-5/+5
2022-03-23git-prompt: make long upstream state indicator consistentJustin Donnelly1-5/+5
2022-03-23git-prompt: make upstream state indicator location consistentJustin Donnelly1-12/+13
2022-03-23git-prompt: rename `upstream` to `upstream_type`Justin Donnelly1-13/+13
2022-03-23cocci: allow padding with `strbuf_addf()`Johannes Schindelin1-3/+3
2022-03-15completion: tab completion of filenames for 'git restore'David Cantrell1-0/+4
2022-03-13Merge branch 'ab/make-optim-noop'Junio C Hamano2-15/+8
2022-03-10core.fsyncmethod: add writeout-only modeNeeraj Singh1-4/+12
2022-03-06Merge branch 'jc/rerere-train-modernise'Junio C Hamano1-1/+1
2022-03-03Makefile: add "$(QUIET)" boilerplate to shared.makÆvar Arnfjörð Bjarmason1-14/+0
2022-03-03Makefiles: add "shared.mak", move ".DELETE_ON_ERROR" to itÆvar Arnfjörð Bjarmason2-0/+6
2022-03-03scalar Makefile: use "The default target of..." patternÆvar Arnfjörð Bjarmason1-6/+7
2022-02-27rerere-train: two fixes to the use of "git show -s"Junio C Hamano1-1/+1
2022-02-17Merge branch 'ab/complete-show-all-commands'Junio C Hamano1-1/+12
2022-02-17Merge branch 'js/scalar-global-options'Junio C Hamano3-1/+39
2022-02-17Merge branch 'tk/subtree-merge-not-ff-only'Junio C Hamano1-2/+2
2022-02-16Merge branch 'ld/sparse-index-bash-completion'Junio C Hamano1-8/+36
2022-02-11Merge branch 'bc/csprng-mktemps'Junio C Hamano1-1/+1
2022-02-08completion: handle unusual characters for sparse-checkoutLessley Dennington1-13/+11
2022-02-08completion: improve sparse-checkout cone mode directory completionLessley Dennington1-1/+31
2022-02-08completion: address sparse-checkout issuesLessley Dennington1-8/+8
2022-02-02completion: add a GIT_COMPLETION_SHOW_ALL_COMMANDSÆvar Arnfjörð Bjarmason1-1/+12
2022-02-01subtree: force merge commitThomas Koutcher1-2/+2
2022-01-28scalar: accept -C and -c options before the subcommandJohannes Schindelin3-1/+39
2022-01-17wrapper: add a helper to generate numbers from a CSPRNGbrian m. carlson1-1/+1
2022-01-10Merge branch 'jl/subtree-check-parents-argument-passing-fix'Junio C Hamano1-4/+3
2022-01-04subtree: fix argument handling in check_parentsJames Limbouris1-4/+3
2022-01-03Merge branch 'es/test-chain-lint'Junio C Hamano2-2/+2
2021-12-21Merge branch 'js/scalar'Junio C Hamano7-0/+1266
2021-12-15Merge branch 'en/zdiff3'Junio C Hamano1-3/+3
2021-12-15Merge branch 'hn/reftable'Junio C Hamano2-3/+22
2021-12-13t6000-t9999: detect and signal failure within loopEric Sunshine1-1/+1
2021-12-13tests: fix broken &&-chains in `$(...)` command substitutionsEric Sunshine1-1/+1
2021-12-10Merge branch 'yn/complete-date-format-options'Junio C Hamano1-1/+1
2021-12-10Merge branch 'bc/require-c99'Junio C Hamano1-1/+1
2021-12-10Merge branch 'jk/jump-merge-with-pathspec'Junio C Hamano2-1/+4
2021-12-04scalar: implement the `version` commandJohannes Schindelin1-0/+39
2021-12-04scalar: implement the `delete` commandMatthew John Cheetham3-0/+80
2021-12-04scalar: teach 'reconfigure' to optionally handle all registered enlistmentsJohannes Schindelin3-6/+67
2021-12-04scalar: allow reconfiguring an existing enlistmentJohannes Schindelin3-28/+67
2021-12-04scalar: implement the `run` commandDerrick Stolee2-0/+83
2021-12-04scalar: teach 'clone' to support the --single-branch optionJohannes Schindelin3-4/+23
2021-12-04scalar: implement the `clone` subcommandJohannes Schindelin3-3/+262
2021-12-04scalar: implement 'scalar list'Derrick Stolee2-1/+21
2021-12-04scalar: let 'unregister' handle a deleted enlistment directory gracefullyJohannes Schindelin2-0/+61
2021-12-04scalar: 'unregister' stops background maintenanceDerrick Stolee2-8/+50
2021-12-04scalar: 'register' sets recommended config and starts maintenanceDerrick Stolee2-1/+266
2021-12-04scalar: create test infrastructureJohannes Schindelin3-3/+109
2021-12-04scalar: start documenting the commandJohannes Schindelin1-0/+38
2021-12-04scalar: create a rudimentary executableJohannes Schindelin3-0/+72
2021-12-04scalar: add a README with a roadmapJohannes Schindelin1-0/+82
2021-12-01git-compat-util: add a test balloon for C99 supportbrian m. carlson1-1/+1
2021-12-01xdiff: implement a zealous diff3, or "zdiff3"Phillip Wood1-3/+3
2021-11-29Merge branch 'ab/sh-retire-helper-functions'Junio C Hamano1-1/+0
2021-11-29Merge branch 'tp/send-email-completion'Junio C Hamano1-10/+1
2021-11-25completion: add human and auto: date formatYoichi Nakayama1-1/+1
2021-11-09git-jump: pass "merge" arguments to ls-filesJeff King2-1/+4
2021-10-29Merge branch 're/completion-fix-test-equality'Junio C Hamano1-1/+1
2021-10-28completion: fix incorrect bash/zsh string equality checkRobert Estelle1-1/+1
2021-10-28send-email: programmatically generate bash completionsThiago Perrotta1-10/+1
2021-10-21git-sh-setup: remove "sane_grep", it's not needed anymoreÆvar Arnfjörð Bjarmason1-1/+0
2021-10-18Merge branch 'js/retire-preserve-merges'Junio C Hamano1-1/+1
2021-10-13Merge branch 'ab/help-config-vars'Junio C Hamano1-11/+10
2021-10-13Merge branch 'ab/config-based-hooks-1'Junio C Hamano1-0/+7
2021-10-13Merge branch 'en/removing-untracked-fixes'Junio C Hamano1-1/+1
2021-10-12Merge branch 'rs/xopen-reports-open-failures' into maintJunio C Hamano1-0/+16
2021-10-12Merge branch 'ti/tcsh-completion-regression-fix' into maintJunio C Hamano1-2/+3
2021-10-12Merge branch 'fc/completion-updates' into maintJunio C Hamano1-7/+7
2021-10-08reftable: utility functionsHan-Wen Nienhuys2-3/+22
2021-09-27*.[ch] *_INIT macros: use { 0 } for a "zero out" idiomÆvar Arnfjörð Bjarmason2-2/+2
2021-09-27Comment important codepaths regarding nuking untracked files/dirsElijah Newren1-1/+1
2021-09-27hook-list.h: add a generated list of hooks, like config-list.hÆvar Arnfjörð Bjarmason1-0/+7
2021-09-23Merge branch 'rs/use-xopen-in-index-pack'Junio C Hamano1-5/+8
2021-09-23help / completion: make "git help" do the hard workÆvar Arnfjörð Bjarmason1-11/+10
2021-09-10index-pack: use xopen in init_threadRené Scharfe1-5/+8
2021-09-08Merge branch 'rs/xopen-reports-open-failures'Junio C Hamano1-0/+16
2021-09-07pull: remove support for `--rebase=preserve`Johannes Schindelin1-1/+1
2021-09-03Merge branch 'ti/tcsh-completion-regression-fix'Junio C Hamano1-2/+3
2021-09-03Merge branch 'fc/completion-updates'Junio C Hamano1-7/+7
2021-08-25use xopen() to handle fatal open(2) failuresRené Scharfe1-0/+16
2021-08-18completion: tcsh: Fix regression by drop of wrapper functionsTakashi Iwai1-2/+3
2021-08-18completion: bash: add correct suffix in variablesFelipe Contreras1-3/+3
2021-08-18completion: bash: fix for multiple dash commandsFelipe Contreras1-1/+1
2021-08-18completion: bash: fix for suboptions with valueFelipe Contreras1-1/+1
2021-08-18completion: bash: fix prefix detection in branch.*Felipe Contreras1-2/+2
2021-07-28Merge branch 'ab/attribute-format'Junio C Hamano2-0/+2
2021-07-16Merge branch 'js/gfw-system-config-loc-fix'Junio C Hamano1-4/+7