summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
13 hoursThe twelfth batchHEADmastermainJunio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 hoursMerge branch 'ab/plug-revisions-leak'Junio C Hamano
Plug a bit more leaks in the revisions API. * ab/plug-revisions-leak: revisions API: don't leak memory on argv elements that need free()-ing bisect.c: partially fix bisect_rev_setup() memory leak log: refactor "rev.pending" code in cmd_show() log: fix a memory leak in "git show <revision>..." test-fast-rebase helper: use release_revisions() (again) bisect.c: add missing "goto" for release_revisions()
13 hoursMerge branch 'ab/leak-check'Junio C Hamano
Extend SANITIZE=leak checking and declare more tests "currently leak-free". * ab/leak-check: CI: use "GIT_TEST_SANITIZE_LEAK_LOG=true" in linux-leaks upload-pack: fix a memory leak in create_pack_file() leak tests: mark passing SANITIZE=leak tests as leak-free leak tests: don't skip some tests under SANITIZE=leak test-lib: have the "check" mode for SANITIZE=leak consider leak logs test-lib: add a GIT_TEST_PASSING_SANITIZE_LEAK=check mode test-lib: simplify by removing test_external tests: move copy/pasted PERL + Test::More checks to a lib-perl.sh t/Makefile: don't remove test-results in "clean-except-prove-cache" test-lib: add a SANITIZE=leak logging mode t/README: reword the "GIT_TEST_PASSING_SANITIZE_LEAK" description test-lib: add a --invert-exit-code switch test-lib: fix GIT_EXIT_OK logic errors, use BAIL_OUT test-lib: don't set GIT_EXIT_OK before calling test_atexit_handler test-lib: use $1, not $@ in test_known_broken_{ok,failure}_
13 hoursMerge branch 'gc/git-reflog-doc-markup'Junio C Hamano
Doc mark-up fix. * gc/git-reflog-doc-markup: Documentation/git-reflog: remove unneeded \ from \{
13 hoursMerge branch 'lt/symbolic-ref-sanity'Junio C Hamano
"git symbolic-ref symref non..sen..se" is now diagnosed as an error. * lt/symbolic-ref-sanity: symbolic-ref: refuse to set syntactically invalid target
2 daysSync with Git 2.37.2Junio C Hamano
2 daysGit 2.37.2v2.37.2maintJunio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2 daysMerge branch 'jc/string-list-cleanup' into maintJunio C Hamano
Code clean-up. source: <xmqq7d471dns.fsf@gitster.g> * jc/string-list-cleanup: builtin/remote.c: use the right kind of STRING_LIST_INIT
2 daysMerge branch 'mt/pkt-line-comment-tweak' into maintJunio C Hamano
In-code comment clarification. source: <6a14443c101fa132498297af6d7a483520688d75.1658488203.git.matheus.bernardino@usp.br> * mt/pkt-line-comment-tweak: pkt-line.h: move comment closer to the associated code
2 daysMerge branch 'ma/t4200-update' into maintJunio C Hamano
Test fix. source: <20220718154322.2177166-1-martin.agren@gmail.com> * ma/t4200-update: t4200: drop irrelevant code
2 daysMerge branch 'tb/commit-graph-genv2-upgrade-fix' into maintJunio C Hamano
There was a bug in the codepath to upgrade generation information in commit-graph from v1 to v2 format, which has been corrected. source: <cover.1657667404.git.me@ttaylorr.com> * tb/commit-graph-genv2-upgrade-fix: commit-graph: fix corrupt upgrade from generation v1 to v2 commit-graph: introduce `repo_find_commit_pos_in_graph()` t5318: demonstrate commit-graph generation v2 corruption
2 daysMerge branch 'tk/untracked-cache-with-uall' into maintJunio C Hamano
Fix for a bug that makes write-tree to fail to write out a non-existent index as a tree, introduced in 2.37. source: <20220722212232.833188-1-martin.agren@gmail.com> * tk/untracked-cache-with-uall: read-cache: make `do_read_index()` always set up `istate->repo`
2 daysMerge branch 'mt/checkout-count-fix' into maintJunio C Hamano
"git checkout" miscounted the paths it updated, which has been corrected. source: <cover.1657799213.git.matheus.bernardino@usp.br> * mt/checkout-count-fix: checkout: fix two bugs on the final count of updated entries checkout: show bug about failed entries being included in final report checkout: document bug where delayed checkout counts entries twice
2 daysMerge branch 'cl/rerere-train-with-no-sign' into maintJunio C Hamano
"rerere-train" script (in contrib/) used to honor commit.gpgSign while recreating the throw-away merges. source: <PH7PR14MB5594A27B9295E95ACA4D6A69CE8F9@PH7PR14MB5594.namprd14.prod.outlook.com> * cl/rerere-train-with-no-sign: contrib/rerere-train: avoid useless gpg sign in training
2 daysMerge branch 'kk/p4-client-name-encoding-fix' into maintJunio C Hamano
"git p4" did not handle non-ASCII client name well, which has been corrected. source: <pull.1285.v3.git.git.1658394440.gitgitgadget@gmail.com> * kk/p4-client-name-encoding-fix: git-p4: refactoring of p4CmdList() git-p4: fix bug with encoding of p4 client name
2 daysMerge branch 'mb/p4-utf16-crlf' into maintJunio C Hamano
"git p4" working on UTF-16 files on Windows did not implement CRLF-to-LF conversion correctly, which has been corrected. source: <pull.1294.v2.git.git.1658341065221.gitgitgadget@gmail.com> * mb/p4-utf16-crlf: git-p4: fix CR LF handling for utf16 files
2 daysMerge branch 'hx/lookup-commit-in-graph-fix' into maintJunio C Hamano
A corner case bug where lazily fetching objects from a promisor remote resulted in infinite recursion has been corrected. source: <cover.1656593279.git.hanxin.hx@bytedance.com> * hx/lookup-commit-in-graph-fix: t5330: remove run_with_limited_processses() commit-graph.c: no lazy fetch in lookup_commit_in_graph()
2 daysMerge branch 'jc/resolve-undo' into maintJunio C Hamano
The resolve-undo information in the index was not protected against GC, which has been corrected. source: <xmqq35f7kzad.fsf@gitster.g> * jc/resolve-undo: fsck: do not dereference NULL while checking resolve-undo data revision: mark blobs needed for resolve-undo as reachable
5 daysThe eleventh batchJunio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 daysMerge branch 'js/ort-clean-up-after-failed-merge'Junio C Hamano
Plug memory leaks in the failure code path in the "merge-ort" merge strategy backend. * js/ort-clean-up-after-failed-merge: merge-ort: do leave trace2 region even if checkout fails merge-ort: clean up after failed merge
5 daysMerge branch 'jk/struct-zero-init-with-older-gcc'Junio C Hamano
Older gcc with -Wall complains about the universal zero initializer "struct s = { 0 };" idiom, which makes developers' lives inconvenient (as -Werror is enabled by DEVELOPER=YesPlease). The build procedure has been tweaked to help these compilers. * jk/struct-zero-init-with-older-gcc: config.mak.dev: squelch -Wno-missing-braces for older gcc
5 daysMerge branch 'js/t5351-freebsd-fix'Junio C Hamano
Some tests assumed that core.fsyncMethod=batch is supported everywhere, which broke FreeBSD. * js/t5351-freebsd-fix: t5351: avoid using `test_cmp` for binary data t5351: avoid relying on `core.fsyncMethod = batch` to be supported
5 daysMerge branch 'js/lstat-mingw-enotdir-fix'Junio C Hamano
Fix to lstat() emulation on Windows. * js/lstat-mingw-enotdir-fix: lstat(mingw): correctly detect ENOTDIR scenarios
5 daysMerge branch 'js/mingw-with-python'Junio C Hamano
Conditionally allow building Python interpreter on Windows * js/mingw-with-python: mingw: remove unneeded `NO_CURL` directive mingw: remove unneeded `NO_GETTEXT` directive windows: include the Python bits when building Git for Windows
5 daysMerge branch 'ca/unignore-local-installation-on-windows'Junio C Hamano
Fix build procedure for Windows that uses CMake so that it can pick up the shell interpreter from local installation location. * ca/unignore-local-installation-on-windows: cmake: support local installations of git
7 daysThe tenth batchJunio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 daysSync with 'maint'Junio C Hamano
7 daysMerge branch 'tb/cat-file-z'Junio C Hamano
Operating modes like "--batch" of "git cat-file" command learned to take NUL-terminated input, instead of one-item-per-line. * tb/cat-file-z: builtin/cat-file.c: support NUL-delimited input with `-z` t1006: extract --batch-command inputs to variables
7 daysMerge branch 'jt/fetch-pack-trace2-filter-spec'Junio C Hamano
"git fetch" client logs the partial clone filter used in the trace2 output. * jt/fetch-pack-trace2-filter-spec: fetch-pack: write effective filter to trace2
7 daysMerge branch 'jr/gitweb-title-shortening'Junio C Hamano
Gitweb had legacy URL shortener that is specific to the way projects hosted on kernel.org used to (but no longer) work, which has been removed. * jr/gitweb-title-shortening: gitweb: remove title shortening heuristics
7 daysMerge branch 'gc/bare-repo-discovery'Junio C Hamano
Fix-up for what has been merged to 'master' recently. * gc/bare-repo-discovery: config.c: NULL check when reading protected config
7 daysDownmerge a bit more for 2.37.xJunio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 daysMerge branch 'sg/index-format-doc-update' into maintJunio C Hamano
Docfix. source: <20220718085640.7395-1-szeder.dev@gmail.com> * sg/index-format-doc-update: index-format.txt: remove outdated list of supported extensions
7 daysMerge branch 'ma/sparse-checkout-cone-doc-fix' into maintJunio C Hamano
Docfix. source: <20220718100530.2068354-1-martin.agren@gmail.com> * ma/sparse-checkout-cone-doc-fix: config/core.txt: fix minor issues for `core.sparseCheckoutCone`
7 daysMerge branch 'ds/win-syslog-compiler-fix' into maintJunio C Hamano
Workaround for a false positive compiler warning. source: <pull.1294.git.1658256354725.gitgitgadget@gmail.com> * ds/win-syslog-compiler-fix: compat/win32: correct for incorrect compiler warning
7 daysMerge branch 'ld/osx-keychain-usage-fix' into maintJunio C Hamano
Workaround for a compiler warning against use of die() in osx-keychain (in contrib/). source: <pull.1293.git.1658251503775.gitgitgadget@gmail.com> * ld/osx-keychain-usage-fix: osx-keychain: fix compiler warning
7 daysMerge branch 'ds/doc-wo-whitelist' into maintJunio C Hamano
Avoid "white/black-list" in documentation and code comments. source: <pull.1274.v3.git.1658255537.gitgitgadget@gmail.com> * ds/doc-wo-whitelist: transport.c: avoid "whitelist" t: avoid "whitelist" git.txt: remove redundant language git-cvsserver: clarify directory list daemon: clarify directory arguments
7 daysMerge branch 'mb/config-document-include' into maintJunio C Hamano
Add missing documentation for "include" and "includeIf" features in "git config" file format, which incidentally teaches the command line completion to include them in its offerings. source: <pull.1285.v2.git.1658002423864.gitgitgadget@gmail.com> * mb/config-document-include: config.txt: document include, includeIf
7 daysMerge branch 'rs/mingw-tighten-mkstemp' into maintJunio C Hamano
mkstemp() emulation on Windows has been improved. source: <7265e37f-fd29-3579-b840-19a1df52a59f@web.de> * rs/mingw-tighten-mkstemp: mingw: avoid mktemp() in mkstemp() implementation
7 daysMerge branch 'jk/clone-unborn-confusion' into maintJunio C Hamano
"git clone" from a repository with some ref whose HEAD is unborn did not set the HEAD in the resulting repository correctly, which has been corrected. source: <YsdyLS4UFzj0j/wB@coredump.intra.peff.net> * jk/clone-unborn-confusion: clone: move unborn head creation to update_head() clone: use remote branch if it matches default HEAD clone: propagate empty remote HEAD even with other branches clone: drop extra newline from warning message
10 daysThe ninth batchJunio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 daysMerge branch 'jc/string-list-cleanup'Junio C Hamano
Code clean-up. * jc/string-list-cleanup: builtin/remote.c: use the right kind of STRING_LIST_INIT
10 daysMerge branch 'en/merge-restore-to-pristine'Junio C Hamano
When "git merge" finds that it cannot perform a merge, it should restore the working tree to the state before the command was initiated, but in some corner cases it didn't. * en/merge-restore-to-pristine: merge: do not exit restore_state() prematurely merge: ensure we can actually restore pre-merge state merge: make restore_state() restore staged state too merge: fix save_state() to work when there are stat-dirty files merge: do not abort early if one strategy fails to handle the merge merge: abort if index does not match HEAD for trivial merges merge-resolve: abort if index does not match HEAD merge-ort-wrappers: make printed message match the one from recursive
10 daysMerge branch 'rs/mergesort'Junio C Hamano
Make our mergesort implementation type-safe. * rs/mergesort: mergesort: remove llist_mergesort() packfile: use DEFINE_LIST_SORT fetch-pack: use DEFINE_LIST_SORT commit: use DEFINE_LIST_SORT blame: use DEFINE_LIST_SORT test-mergesort: use DEFINE_LIST_SORT test-mergesort: use DEFINE_LIST_SORT_DEBUG mergesort: add macros for typed sort of linked lists mergesort: tighten merge loop mergesort: unify ranks loops
10 daysMerge branch 'sa/cat-file-mailmap'Junio C Hamano
"git cat-file" learned an option to use the mailmap when showing commit and tag objects. * sa/cat-file-mailmap: cat-file: add mailmap support ident: rename commit_rewrite_person() to apply_mailmap_to_header() ident: move commit_rewrite_person() to ident.c revision: improve commit_rewrite_person()
10 daysMerge branch 'zh/ls-files-format'Junio C Hamano
"git ls-files" learns the "--format" option to tweak its output. * zh/ls-files-format: ls-files: introduce "--format" option
10 daysMerge branch 'tb/commit-graph-genv2-upgrade-fix'Junio C Hamano
There was a bug in the codepath to upgrade generation information in commit-graph from v1 to v2 format, which has been corrected. * tb/commit-graph-genv2-upgrade-fix: commit-graph: fix corrupt upgrade from generation v1 to v2 commit-graph: introduce `repo_find_commit_pos_in_graph()` t5318: demonstrate commit-graph generation v2 corruption
10 daysMerge branch 'tk/untracked-cache-with-uall'Junio C Hamano
Fix for a bug that makes write-tree to fail to write out a non-existent index as a tree, introduced in 2.37. * tk/untracked-cache-with-uall: read-cache: make `do_read_index()` always set up `istate->repo`
10 daysMerge branch 'pw/xdiff-alloc'Junio C Hamano
Add a level of redirection to array allocation API in xdiff part, to make it easier to share with the libgit2 project. * pw/xdiff-alloc: xdiff: introduce XDL_ALLOC_GROW() xdiff: introduce XDL_CALLOC_ARRAY() xdiff: introduce xdl_calloc xdiff: introduce XDL_ALLOC_ARRAY()
10 daysMerge branch 'ds/midx-with-less-memory'Junio C Hamano
The codepath to write multi-pack index has been taught to release a large chunk of memory that holds an array of objects in the packs, as soon as it is done with the array, to reduce memory consumption. * ds/midx-with-less-memory: write_midx_bitmap(): drop unused refs_snapshot parameter midx: reduce memory pressure while writing bitmaps midx: extract bitmap write setup pack-bitmap-write: use const for hashes