summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2022-12-13Git 2.37.5v2.37.5Junio C Hamano3-2/+7
2022-12-13Merge branch 'maint-2.36' into maint-2.37Junio C Hamano19-125/+557
2022-12-13Git 2.36.4v2.36.4Junio C Hamano3-2/+7
2022-12-13Merge branch 'maint-2.35' into maint-2.36Junio C Hamano18-125/+552
2022-12-13Git 2.35.6v2.35.6Junio C Hamano3-2/+7
2022-12-13Merge branch 'maint-2.34' into maint-2.35Junio C Hamano17-125/+547
2022-12-13Git 2.34.6v2.34.6Junio C Hamano3-2/+7
2022-12-13Merge branch 'maint-2.33' into maint-2.34Junio C Hamano17-125/+546
2022-12-13Git 2.33.6v2.33.6Junio C Hamano3-2/+7
2022-12-13Sync with Git 2.32.5Junio C Hamano16-125/+541
2022-12-13Git 2.32.5v2.32.5Junio C Hamano3-2/+10
2022-12-13Merge branch 'ps/attr-limits-with-fsck' into maint-2.32Junio C Hamano3-43/+130
2022-12-13Sync with Git 2.31.6Junio C Hamano12-82/+403
2022-12-13Git 2.31.6v2.31.6Junio C Hamano3-2/+7
2022-12-13Sync with Git 2.30.7Junio C Hamano11-82/+402
2022-12-13Git 2.30.7v2.30.7Junio C Hamano3-2/+88
2022-12-09fsck: implement checks for gitattributesPatrick Steinhardt3-1/+73
2022-12-09fsck: move checks for gitattributesPatrick Steinhardt1-5/+7
2022-12-09fsck: pull out function to check a set of blobsPatrick Steinhardt1-12/+22
2022-12-09fsck: refactor `fsck_blob()` to allow for more checksPatrick Steinhardt1-26/+29
2022-12-09Merge branch 'ps/attr-limits' into maint-2.32Junio C Hamano3-35/+127
2022-12-09Merge branch 'ps/attr-limits' into maint-2.30Junio C Hamano3-36/+132
2022-12-09Merge branch 'ps/format-padding-fix' into maint-2.30Junio C Hamano7-47/+185
2022-12-09pretty: restrict input lengths for padding and wrapping formatsPatrick Steinhardt2-9/+41
2022-12-09utf8: refactor `strbuf_utf8_replace` to not rely on preallocated bufferPatrick Steinhardt1-21/+13
2022-12-09utf8: fix checking for glyph width in `strbuf_utf8_replace()`Patrick Steinhardt2-5/+21
2022-12-09utf8: fix overflow when returning string widthPatrick Steinhardt2-3/+17
2022-12-09utf8: fix returning negative string widthPatrick Steinhardt2-2/+12
2022-12-09utf8: fix truncated string lengths in `utf8_strnwidth()`Patrick Steinhardt4-9/+7
2022-12-09pretty: fix integer overflow in wrapping formatPatrick Steinhardt3-1/+23
2022-12-09pretty: fix adding linefeed when placeholder is not expandedPatrick Steinhardt2-1/+21
2022-12-09pretty: fix out-of-bounds read when parsing invalid padding formatPatrick Steinhardt2-1/+7
2022-12-09pretty: fix out-of-bounds read when left-flushing with stealingPatrick Steinhardt2-1/+7
2022-12-09pretty: fix out-of-bounds write caused by integer overflowPatrick Steinhardt2-5/+23
2022-12-09test-lib: add prerequisite for 64-bit platformsCarlo Marcelo Arenas Belón1-0/+4
2022-12-05attr: ignore overly large gitattributes filesPatrick Steinhardt3-2/+45
2022-12-05attr: ignore attribute lines exceeding 2048 bytesPatrick Steinhardt3-2/+34
2022-12-05attr: fix silently splitting up lines longer than 2048 bytesPatrick Steinhardt2-6/+28
2022-12-05attr: harden allocation against integer overflowsPatrick Steinhardt1-4/+3
2022-12-05attr: fix integer overflow with more than INT_MAX macrosPatrick Steinhardt1-5/+5
2022-12-05attr: fix out-of-bounds read with unreasonable amount of patternsPatrick Steinhardt1-9/+9
2022-12-05attr: fix out-of-bounds write when parsing huge number of attributesPatrick Steinhardt1-8/+8
2022-12-05attr: fix integer overflow when parsing huge attribute namesPatrick Steinhardt1-1/+1
2022-12-05attr: fix out-of-bounds read with huge attribute namesPatrick Steinhardt1-1/+1
2022-12-05attr: fix overflow when upserting attribute with overly long namePatrick Steinhardt1-1/+1
2022-10-06Git 2.37.4v2.37.4Taylor Blau1-1/+1
2022-10-06Sync with 2.36.3Taylor Blau71-60/+350
2022-10-06t7527: prepare for changing protocol.file.allowTaylor Blau1-0/+4
2022-10-06Git 2.36.3v2.36.3Taylor Blau3-2/+7
2022-10-06Sync with 2.35.5Taylor Blau66-59/+305
2022-10-06Git 2.35.5v2.35.5Taylor Blau3-2/+7
2022-10-06Sync with 2.34.5Taylor Blau63-59/+295
2022-10-06Git 2.34.5v2.34.5Taylor Blau3-2/+7
2022-10-06Sync with 2.33.5Taylor Blau64-59/+295
2022-10-06Git 2.33.5v2.33.5Taylor Blau3-2/+7
2022-10-06Sync with 2.32.4Taylor Blau63-60/+291
2022-10-06Git 2.32.4v2.32.4Taylor Blau2-1/+6
2022-10-06Sync with 2.31.5Taylor Blau61-61/+282
2022-10-06Git 2.31.5v2.31.5Taylor Blau2-1/+6
2022-10-06Sync with 2.30.6Taylor Blau60-61/+277
2022-10-06Git 2.30.6v2.30.6Taylor Blau3-2/+62
2022-10-05t5537: prepare for changing protocol.file.allowTaylor Blau1-1/+2
2022-10-05t3206: prepare for changing protocol.file.allowTaylor Blau1-1/+1
2022-10-01t7814: prepare for changing protocol.file.allowTaylor Blau1-0/+1
2022-10-01t5537: prepare for changing protocol.file.allowTaylor Blau1-0/+2
2022-10-01t5516: prepare for changing protocol.file.allowTaylor Blau1-0/+1
2022-10-01t3207: prepare for changing protocol.file.allowTaylor Blau1-0/+1
2022-10-01t2080: prepare for changing protocol.file.allowTaylor Blau1-0/+3
2022-10-01t1092: prepare for changing protocol.file.allowTaylor Blau1-0/+2
2022-10-01t2080: prepare for changing protocol.file.allowTaylor Blau1-0/+3
2022-10-01t1092: prepare for changing protocol.file.allowTaylor Blau1-0/+2
2022-10-01alias.c: reject too-long cmdline strings in split_cmdline()Kevin Backhouse1-2/+9
2022-10-01shell: limit size of interactive commandsJeff King2-4/+36
2022-10-01shell: add basic testsJeff King1-0/+31
2022-10-01transport: make `protocol.file.allow` be "user" by defaultTaylor Blau2-5/+4
2022-10-01t/t9NNN: allow local submodulesTaylor Blau2-0/+3
2022-10-01t/t7NNN: allow local submodulesTaylor Blau23-1/+62
2022-10-01t/t6NNN: allow local submodulesTaylor Blau2-2/+2
2022-10-01t/t5NNN: allow local submodulesTaylor Blau8-0/+19
2022-10-01t/t4NNN: allow local submodulesTaylor Blau4-3/+5
2022-10-01t/t3NNN: allow local submodulesTaylor Blau6-4/+9
2022-10-01t/2NNNN: allow local submodulesTaylor Blau3-2/+8
2022-10-01t/t1NNN: allow local submodulesTaylor Blau2-2/+4
2022-10-01t/lib-submodule-update.sh: allow local submodulesTaylor Blau1-0/+1
2022-10-01builtin/clone.c: disallow `--local` clones with symlinksTaylor Blau2-35/+23
2022-09-13Merge a handful of topics from the 'master' frontJunio C Hamano2-1/+32
2022-09-13Merge branch 'en/merge-unstash-only-on-clean-merge' into maintJunio C Hamano2-1/+13
2022-09-13Merge branch 'ds/github-actions-use-newer-ubuntu' into maintJunio C Hamano1-1/+1
2022-09-13Merge branch 'ad/preload-plug-memleak' into maintJunio C Hamano1-0/+6
2022-09-13Merge branch 'sg/xcalloc-cocci-fix' into maintJunio C Hamano1-1/+1
2022-09-13Merge branch 'jk/pipe-command-nonblock' into maintJunio C Hamano7-27/+123
2022-09-13Merge branch 'jk/is-promisor-object-keep-tree-in-use' into maintJunio C Hamano2-2/+20
2022-08-30Git 2.37.3v2.37.3Junio C Hamano2-4/+4
2022-08-26A handful more topics from the 'master' front for 2.37.3Junio C Hamano2-1/+47
2022-08-26Merge branch 'po/doc-add-renormalize' into maintJunio C Hamano1-1/+3
2022-08-26Merge branch 'vd/sparse-reset-checkout-fixes' into maintJunio C Hamano6-10/+141
2022-08-26Merge branch 'jk/fsck-tree-mode-bits-fix' into maintJunio C Hamano7-10/+51
2022-08-26Merge branch 'fc/vimdiff-layout-vimdiff3-fix' into maintJunio C Hamano1-59/+43
2022-08-26Merge branch 'js/safe-directory-plus' into maintJunio C Hamano4-15/+81
2022-08-26Merge branch 'pw/use-glibc-tunable-for-malloc-optim' into maintJunio C Hamano1-3/+8
2022-08-26Merge branch 'ab/hooks-regression-fix' into maintJunio C Hamano2-7/+26
2022-08-26Merge branch 'gc/git-reflog-doc-markup' into maintJunio C Hamano1-1/+1
2022-08-26Merge branch 'js/ort-clean-up-after-failed-merge' into maintJunio C Hamano1-0/+5
2022-08-26Merge branch 'jk/struct-zero-init-with-older-gcc' into maintJunio C Hamano1-0/+4
2022-08-26Merge branch 'js/lstat-mingw-enotdir-fix' into maintJunio C Hamano1-2/+2
2022-08-26Merge branch 'js/mingw-with-python' into maintJunio C Hamano1-3/+2
2022-08-26Merge branch 'ca/unignore-local-installation-on-windows' into maintJunio C Hamano1-1/+1
2022-08-24ci: update 'static-analysis' to Ubuntu 22.04Derrick Stolee1-1/+1
2022-08-24merge: only apply autostash when appropriateElijah Newren2-1/+13
2022-08-24promisor-remote: fix xcalloc() argument orderSZEDER Gábor1-1/+1
2022-08-22preload-index: fix memleakAnthony Delannoy1-0/+6
2022-08-17pipe_command(): mark stdin descriptor as non-blockingJeff King2-0/+23
2022-08-17pipe_command(): handle ENOSPC when writing to a pipeJeff King1-1/+2
2022-08-17pipe_command(): avoid xwrite() for writing to pipeJeff King1-5/+17
2022-08-17git-compat-util: make MAX_IO_SIZE define globally availableJeff King2-22/+22
2022-08-17nonblock: support WindowsRené Scharfe1-0/+27
2022-08-17compat: add function to enable nonblocking pipesJeff King3-0/+33
2022-08-14is_promisor_object(): fix use-after-free of tree bufferJeff King2-2/+20
2022-08-10Git 2.37.2v2.37.2Junio C Hamano2-1/+25
2022-08-10Merge branch 'jc/string-list-cleanup' into maintJunio C Hamano1-2/+1
2022-08-10Merge branch 'mt/pkt-line-comment-tweak' into maintJunio C Hamano1-8/+8
2022-08-10Merge branch 'ma/t4200-update' into maintJunio C Hamano1-3/+0
2022-08-10Merge branch 'tb/commit-graph-genv2-upgrade-fix' into maintJunio C Hamano4-8/+56
2022-08-10Merge branch 'tk/untracked-cache-with-uall' into maintJunio C Hamano2-0/+7
2022-08-10Merge branch 'mt/checkout-count-fix' into maintJunio C Hamano10-24/+113
2022-08-10Merge branch 'cl/rerere-train-with-no-sign' into maintJunio C Hamano1-1/+1
2022-08-10Merge branch 'kk/p4-client-name-encoding-fix' into maintJunio C Hamano1-9/+42
2022-08-10Merge branch 'mb/p4-utf16-crlf' into maintJunio C Hamano1-1/+1
2022-08-10Merge branch 'hx/lookup-commit-in-graph-fix' into maintJunio C Hamano2-1/+48
2022-08-10Merge branch 'jc/resolve-undo' into maintJunio C Hamano3-0/+146
2022-08-10fsck: downgrade tree badFilemode to "info"Jeff King2-1/+18
2022-08-10fsck: actually detect bad file modes in treesJeff King2-1/+15
2022-08-10tree-walk: add a mechanism for getting non-canonicalized modesJeff King4-9/+19
2022-08-10mergetools: vimdiff: simplify tabfirstFelipe Contreras1-25/+19
2022-08-10mergetools: vimdiff: fix single window layoutsFelipe Contreras1-12/+8
2022-08-10mergetools: vimdiff: rework tab logicFelipe Contreras1-28/+22
2022-08-10mergetools: vimdiff: fix for diffoptFelipe Contreras1-18/+18
2022-08-10mergetools: vimdiff: silence annoying messagesFelipe Contreras1-2/+2
2022-08-10mergetools: vimdiff: make vimdiff3 actually workFelipe Contreras1-18/+18
2022-08-10mergetools: vimdiff: fix commentFelipe Contreras1-2/+2
2022-08-10doc add: renormalize is not idempotent for CRCRLFPhilip Oakley1-1/+3
2022-08-08unpack-trees: unpack new trees as sparse directoriesVictoria Dye2-10/+113
2022-08-08cache.h: create 'index_name_pos_sparse()'Victoria Dye2-0/+14
2022-08-08oneway_diff: handle removed sparse directoriesVictoria Dye1-0/+5
2022-08-08checkout: fix nested sparse directory diff in sparse indexVictoria Dye2-0/+9
2022-08-08mingw: handle a file owned by the Administrators group correctlyJohannes Schindelin1-0/+10
2022-08-08mingw: be more informative when ownership check fails on FAT32Johannes Schindelin1-1/+24
2022-08-08mingw: provide details about unsafe directories' ownershipJohannes Schindelin1-0/+24
2022-08-08setup: prepare for more detailed "dubious ownership" messagesJohannes Schindelin4-13/+21
2022-08-08setup: fix some formattingJohannes Schindelin1-4/+5
2022-08-05Downmerge a bit more for 2.37.xJunio C Hamano1-0/+17
2022-08-05Merge branch 'sg/index-format-doc-update' into maintJunio C Hamano1-2/+0
2022-08-05Merge branch 'ma/sparse-checkout-cone-doc-fix' into maintJunio C Hamano1-2/+2
2022-08-05Merge branch 'ds/win-syslog-compiler-fix' into maintJunio C Hamano1-3/+4
2022-08-05Merge branch 'ld/osx-keychain-usage-fix' into maintJunio C Hamano1-1/+1
2022-08-05Merge branch 'ds/doc-wo-whitelist' into maintJunio C Hamano11-40/+39
2022-08-05Merge branch 'mb/config-document-include' into maintJunio C Hamano3-0/+21
2022-08-05Merge branch 'rs/mingw-tighten-mkstemp' into maintJunio C Hamano1-4/+1
2022-08-05Merge branch 'jk/clone-unborn-confusion' into maintJunio C Hamano3-39/+117
2022-08-05hook API: don't segfault on strbuf_addf() to NULL "out"Ævar Arnfjörð Bjarmason2-7/+26
2022-08-04tests: cache glibc version checkPhillip Wood1-3/+8
2022-08-01Documentation/git-reflog: remove unneeded \ from \{Glen Choo1-1/+1
2022-07-31merge-ort: do leave trace2 region even if checkout failsJohannes Schindelin1-0/+3
2022-07-31merge-ort: clean up after failed mergeJohannes Schindelin1-0/+2
2022-07-31config.mak.dev: squelch -Wno-missing-braces for older gccJeff King1-0/+4
2022-07-29lstat(mingw): correctly detect ENOTDIR scenariosJohannes Schindelin1-2/+2
2022-07-29mingw: remove unneeded `NO_CURL` directiveJohannes Schindelin1-1/+0
2022-07-29mingw: remove unneeded `NO_GETTEXT` directiveJohannes Schindelin1-1/+0
2022-07-29windows: include the Python bits when building Git for WindowsJohannes Schindelin1-1/+2
2022-07-27Downmerge a handful of fixes for 2.37.x maintenance trackJunio C Hamano2-1/+48
2022-07-27Merge branch 'tk/rev-parse-doc-clarify-at-u' into maintJunio C Hamano1-9/+6
2022-07-27Merge branch 'll/ls-files-tests-update' into maintJunio C Hamano5-71/+132
2022-07-27Merge branch 'ds/t5510-brokequote' into maintJunio C Hamano1-1/+5
2022-07-27Merge branch 'tb/pack-objects-remove-pahole-comment' into maintJunio C Hamano1-10/+0
2022-07-27Merge branch 'en/t6429-test-must-be-empty-fix' into maintJunio C Hamano1-1/+1
2022-07-27Merge branch 'ds/vscode-settings' into maintJunio C Hamano1-2/+6
2022-07-27Merge branch 'cr/setup-bug-typo' into maintJunio C Hamano1-1/+1
2022-07-27Merge branch 'pb/diff-doc-raw-format' into maintJunio C Hamano2-6/+6
2022-07-27Merge branch 'jk/revisions-doc-markup-fix' into maintJunio C Hamano1-1/+1
2022-07-27Merge branch 'rs/combine-diff-with-incompatible-options' into maintJunio C Hamano1-0/+7
2022-07-27Merge branch 'ac/bitmap-format-doc' into maintJunio C Hamano2-96/+108
2022-07-27Merge branch 'ab/test-quoting-fix' into maintJunio C Hamano5-7/+8
2022-07-27Merge branch 'ro/mktree-allow-missing-fix' into maintJunio C Hamano1-2/+9
2022-07-27Merge branch 'dr/i18n-die-warn-error-usage' into maintJunio C Hamano1-4/+4
2022-07-27Merge branch 'ds/git-rebase-doc-markup' into maintJunio C Hamano1-120/+122
2022-07-27Merge branch 'gg/worktree-from-the-above' into maintJunio C Hamano2-7/+293
2022-07-27Merge branch 'fr/vimdiff-layout-fix' into maintJunio C Hamano1-18/+18
2022-07-27Merge branch 'en/merge-dual-dir-renames-fix' into maintJunio C Hamano2-26/+153
2022-07-27Merge branch 'jk/diff-files-cleanup-fix' into maintJunio C Hamano1-1/+1
2022-07-27Merge branch 'js/vimdiff-quotepath-fix' into maintJunio C Hamano1-4/+35
2022-07-27Merge branch 'js/shortlog-sort-stably' into maintJunio C Hamano1-1/+1
2022-07-27Merge branch 'js/ci-github-workflow-markup' into maintJunio C Hamano1-5/+5
2022-07-27cmake: support local installations of gitCarlo Marcelo Arenas Belón1-1/+1
2022-07-22read-cache: make `do_read_index()` always set up `istate->repo`Martin Ågren2-1/+9
2022-07-22pkt-line.h: move comment closer to the associated codeMatheus Tavares1-8/+8
2022-07-21git-p4: refactoring of p4CmdList()Kilian Kilger1-11/+42
2022-07-20builtin/remote.c: use the right kind of STRING_LIST_INITJunio C Hamano1-2/+1
2022-07-20git-p4: fix CR LF handling for utf16 filesMoritz Baumann1-1/+1
2022-07-19compat/win32: correct for incorrect compiler warningDerrick Stolee1-3/+4
2022-07-19transport.c: avoid "whitelist"Derrick Stolee1-4/+4