summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-02-08Git 2.44-rc0v2.44.0-rc0Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-02-08Sync with Git 2.43.1Junio C Hamano
2024-02-08Git 2.43.1v2.43.1Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-02-08Merge branch 'ib/rebase-reschedule-doc' into maint-2.43Junio C Hamano
Doc update. * ib/rebase-reschedule-doc: rebase: clarify --reschedule-failed-exec default
2024-02-08Merge branch 'jk/index-pack-lsan-false-positive-fix' into maint-2.43Junio C Hamano
Fix false positive reported by leak sanitizer. * jk/index-pack-lsan-false-positive-fix: index-pack: spawn threads atomically
2024-02-08Merge branch 'cp/sideband-array-index-comment-fix' into maint-2.43Junio C Hamano
In-code comment fix. * cp/sideband-array-index-comment-fix: sideband.c: remove redundant 'NEEDSWORK' tag
2024-02-08Merge branch 'ms/rebase-insnformat-doc-fix' into maint-2.43Junio C Hamano
Docfix. * ms/rebase-insnformat-doc-fix: Documentation: fix statement about rebase.instructionFormat
2024-02-08Merge branch 'jx/sideband-chomp-newline-fix' into maint-2.43Junio C Hamano
Sideband demultiplexer fixes. * jx/sideband-chomp-newline-fix: pkt-line: do not chomp newlines for sideband messages pkt-line: memorize sideband fragment in reader test-pkt-line: add option parser for unpack-sideband
2024-02-08Merge branch 'jk/t1006-cat-file-objectsize-disk' into maint-2.43Junio C Hamano
Test update. * jk/t1006-cat-file-objectsize-disk: t1006: prefer shell loop to awk for packed object sizes t1006: add tests for %(objectsize:disk)
2024-02-08Merge branch 'js/contributor-docs-updates' into maint-2.43Junio C Hamano
Doc update. * js/contributor-docs-updates: SubmittingPatches: hyphenate non-ASCII SubmittingPatches: clarify GitHub artifact format SubmittingPatches: clarify GitHub visual SubmittingPatches: provide tag naming advice SubmittingPatches: update extra tags list SubmittingPatches: discourage new trailers SubmittingPatches: drop ref to "What's in git.git" CodingGuidelines: write punctuation marks CodingGuidelines: move period inside parentheses
2024-02-08Merge branch 'rs/fast-import-simplify-mempool-allocation' into maint-2.43Junio C Hamano
Code simplification. * rs/fast-import-simplify-mempool-allocation: fast-import: use mem_pool_calloc()
2024-02-08Merge branch 'en/header-cleanup' into maint-2.43Junio C Hamano
Remove unused header "#include". * en/header-cleanup: treewide: remove unnecessary includes in source files treewide: add direct includes currently only pulled in transitively trace2/tr2_tls.h: remove unnecessary include submodule-config.h: remove unnecessary include pkt-line.h: remove unnecessary include line-log.h: remove unnecessary include http.h: remove unnecessary include fsmonitor--daemon.h: remove unnecessary includes blame.h: remove unnecessary includes archive.h: remove unnecessary include treewide: remove unnecessary includes in source files treewide: remove unnecessary includes from header files
2024-02-08Merge branch 'ml/doc-merge-updates' into maint-2.43Junio C Hamano
Doc update. * ml/doc-merge-updates: Documentation/git-merge.txt: use backticks for command wrapping Documentation/git-merge.txt: fix reference to synopsis
2024-02-08Merge branch 'jc/orphan-unborn' into maint-2.43Junio C Hamano
Doc updates to clarify what an "unborn branch" means. * jc/orphan-unborn: orphan/unborn: fix use of 'orphan' in end-user facing messages orphan/unborn: add to the glossary and use them consistently
2024-02-08Merge branch 'la/trailer-cleanups' into maint-2.43Junio C Hamano
Code clean-up. * la/trailer-cleanups: trailer: use offsets for trailer_start/trailer_end trailer: find the end of the log message commit: ignore_non_trailer computes number of bytes to ignore
2024-02-08Merge branch 'jc/retire-cas-opt-name-constant' into maint-2.43Junio C Hamano
Code clean-up. * jc/retire-cas-opt-name-constant: remote.h: retire CAS_OPT_NAME
2024-02-08Merge branch 'rs/rebase-use-strvec-pushf' into maint-2.43Junio C Hamano
Code clean-up. * rs/rebase-use-strvec-pushf: rebase: use strvec_pushf() for format-patch revisions
2024-02-08Merge branch 'rs/t6300-compressed-size-fix' into maint-2.43Junio C Hamano
Test fix. * rs/t6300-compressed-size-fix: t6300: avoid hard-coding object sizes
2024-02-08Merge branch 'sp/test-i18ngrep' into maint-2.43Junio C Hamano
Error message fix in the test framework. * sp/test-i18ngrep: test-lib-functions.sh: fix test_grep fail message wording
2024-02-08Merge branch 'jc/doc-misspelt-refs-fix' into maint-2.43Junio C Hamano
Doc update. * jc/doc-misspelt-refs-fix: doc: format.notes specify a ref under refs/notes/ hierarchy
2024-02-08Merge branch 'jc/doc-most-refs-are-not-that-special' into maint-2.43Junio C Hamano
Doc updates. * jc/doc-most-refs-are-not-that-special: docs: MERGE_AUTOSTASH is not that special docs: AUTO_MERGE is not that special refs.h: HEAD is not that special git-bisect.txt: BISECT_HEAD is not that special git.txt: HEAD is not that special
2024-02-08Merge branch 'es/add-doc-list-short-form-of-all-in-synopsis' into maint-2.43Junio C Hamano
Doc update. * es/add-doc-list-short-form-of-all-in-synopsis: git-add.txt: add missing short option -A to synopsis
2024-02-08Merge branch 'ps/chainlint-self-check-update' into maint-2.43Junio C Hamano
Test framework update. * ps/chainlint-self-check-update: tests: adjust whitespace in chainlint expectations
2024-02-08Merge branch 'ps/reftable-fixes' into maint-2.43Junio C Hamano
Bunch of small fix-ups to the reftable code. * ps/reftable-fixes: reftable/block: reuse buffer to compute record keys reftable/block: introduce macro to initialize `struct block_iter` reftable/merged: reuse buffer to compute record keys reftable/stack: fix use of unseeded randomness reftable/stack: fix stale lock when dying reftable/stack: reuse buffers when reloading stack reftable/stack: perform auto-compaction with transactional interface reftable/stack: verify that `reftable_stack_add()` uses auto-compaction reftable: handle interrupted writes reftable: handle interrupted reads reftable: wrap EXPECT macros in do/while
2024-02-08Merge branch 'jk/config-cleanup' into maint-2.43Junio C Hamano
Code clean-up around use of configuration variables. * jk/config-cleanup: sequencer: simplify away extra git_config_string() call gpg-interface: drop pointless config_error_nonbool() checks push: drop confusing configset/callback redundancy config: use git_config_string() for core.checkRoundTripEncoding diff: give more detailed messages for bogus diff.* config config: use config_error_nonbool() instead of custom messages imap-send: don't use git_die_config() inside callback git_xmerge_config(): prefer error() to die() config: reject bogus values for core.checkstat
2024-02-08Merge branch 'rs/incompatible-options-messages' into maint-2.43Junio C Hamano
Clean-up code that handles combinations of incompatible options. * rs/incompatible-options-messages: worktree: simplify incompatibility message for --orphan and commit-ish worktree: standardize incompatibility messages clean: factorize incompatibility message revision, rev-parse: factorize incompatibility messages about - -exclude-hidden revision: use die_for_incompatible_opt3() for - -graph/--reverse/--walk-reflogs repack: use die_for_incompatible_opt3() for -A/-k/--cruft push: use die_for_incompatible_opt4() for - -delete/--tags/--all/--mirror
2024-02-08Merge branch 'mk/doc-gitfile-more' into maint-2.43Junio C Hamano
Doc update. * mk/doc-gitfile-more: doc: make the gitfile syntax easier to discover
2024-02-08Merge branch 'ps/ref-tests-update-more' into maint-2.43Junio C Hamano
Tests update. * ps/ref-tests-update-more: t6301: write invalid object ID via `test-tool ref-store` t5551: stop writing packed-refs directly t5401: speed up creation of many branches t4013: simplify magic parsing and drop "failure" t3310: stop checking for reference existence via `test -f` t1417: make `reflog --updateref` tests backend agnostic t1410: use test-tool to create empty reflog t1401: stop treating FETCH_HEAD as real reference t1400: split up generic reflog tests from the reffile-specific ones t0410: mark tests to require the reffiles backend
2024-02-08Merge branch 'rs/column-leakfix' into maint-2.43Junio C Hamano
Leakfix. * rs/column-leakfix: column: release strbuf and string_list after use
2024-02-08Merge branch 'rs/i18n-cannot-be-used-together' into maint-2.43Junio C Hamano
Clean-up code that handles combinations of incompatible options. * rs/i18n-cannot-be-used-together: i18n: factorize even more 'incompatible options' messages
2024-02-08Merge branch 'jb/reflog-expire-delete-dry-run-options' into maint-2.43Junio C Hamano
Command line parsing fix for "git reflog". * jb/reflog-expire-delete-dry-run-options: builtin/reflog.c: fix dry-run option short name
2024-02-08Merge branch 'js/packfile-h-typofix' into maint-2.43Junio C Hamano
Typofix. * js/packfile-h-typofix: packfile.c: fix a typo in `each_file_in_pack_dir_fn()`'s declaration
2024-02-08Merge branch 'jk/commit-graph-slab-clear-fix' into maint-2.43Junio C Hamano
Clearing in-core repository (happens during e.g., "git fetch --recurse-submodules" with commit graph enabled) made in-core commit object in an inconsistent state by discarding the necessary data from commit-graph too early, which has been corrected. * jk/commit-graph-slab-clear-fix: commit-graph: retain commit slab when closing NULL commit_graph
2024-02-08Merge branch 'cp/git-flush-is-an-env-bool' into maint-2.43Junio C Hamano
Unlike other environment variables that took the usual true/false/yes/no as well as 0/1, GIT_FLUSH only understood 0/1, which has been corrected. * cp/git-flush-is-an-env-bool: write-or-die: make GIT_FLUSH a Boolean environment variable
2024-02-08Merge branch 'jc/sparse-checkout-set-default-fix' into maint-2.43Junio C Hamano
"git sparse-checkout set" added default patterns even when the patterns are being fed from the standard input, which has been corrected. * jc/sparse-checkout-set-default-fix: sparse-checkout: use default patterns for 'set' only !stdin
2024-02-08Merge branch 'jc/archive-list-with-extra-args' into maint-2.43Junio C Hamano
"git archive --list extra garbage" silently ignored excess command line parameters, which has been corrected. * jc/archive-list-with-extra-args: archive: "--list" does not take further options
2024-02-08Merge branch 'rj/status-bisect-while-rebase' into maint-2.43Junio C Hamano
"git status" is taught to show both the branch being bisected and being rebased when both are in effect at the same time. cf. <xmqqil76kyov.fsf@gitster.g> * rj/status-bisect-while-rebase: status: fix branch shown when not only bisecting
2024-02-08Merge branch 'sh/completion-with-reftable' into maint-2.43Junio C Hamano
Command line completion script (in contrib/) learned to work better with the reftable backend. * sh/completion-with-reftable: completion: support pseudoref existence checks for reftables completion: refactor existence checks for pseudorefs
2024-02-08Merge branch 'jx/fetch-atomic-error-message-fix' into maint-2.43Junio C Hamano
"git fetch --atomic" issued an unnecessary empty error message, which has been corrected. cf. <ZX__e7VjyLXIl-uV@tanuki> * jx/fetch-atomic-error-message-fix: fetch: no redundant error message for atomic fetch t5574: test porcelain output of atomic fetch
2024-02-08Merge branch 'jk/mailinfo-iterative-unquote-comment' into maint-2.43Junio C Hamano
The code to parse the From e-mail header has been updated to avoid recursion. * jk/mailinfo-iterative-unquote-comment: mailinfo: avoid recursion when unquoting From headers t5100: make rfc822 comment test more careful mailinfo: fix out-of-bounds memory reads in unquote_quoted_pair()
2024-02-08Merge branch 'rs/show-ref-incompatible-options' into maint-2.43Junio C Hamano
Code clean-up for sanity checking of command line options for "git show-ref". * rs/show-ref-incompatible-options: show-ref: use die_for_incompatible_opt3()
2024-02-08Merge branch 'jk/implicit-true' into maint-2.43Junio C Hamano
Some codepaths did not correctly parse configuration variables specified with valueless "true", which has been corrected. * jk/implicit-true: fsck: handle NULL value when parsing message config trailer: handle NULL value when parsing trailer-specific config submodule: handle NULL value when parsing submodule.*.branch help: handle NULL value for alias.* config trace2: handle NULL values in tr2_sysenv config callback setup: handle NULL value when parsing extensions config: handle NULL value when parsing non-bools
2024-02-08Merge branch 'jk/bisect-reset-fix' into maint-2.43Junio C Hamano
"git bisect reset" has been taught to clean up state files and refs even when BISECT_START file is gone. * jk/bisect-reset-fix: bisect: always clean on reset
2024-02-08Merge branch 'jk/end-of-options' into maint-2.43Junio C Hamano
"git $cmd --end-of-options --rev -- --path" for some $cmd failed to interpret "--rev" as a rev, and "--path" as a path. This was fixed for many programs like "reset" and "checkout". * jk/end-of-options: parse-options: decouple "--end-of-options" and "--"
2024-02-08Merge branch 'jc/revision-parse-int' into maint-2.43Junio C Hamano
The command line parser for the "log" family of commands was too loose when parsing certain numbers, e.g., silently ignoring the extra 'q' in "git log -n 1q" without complaining, which has been tightened up. * jc/revision-parse-int: revision: parse integer arguments to --max-count, --skip, etc., more carefully
2024-02-08Merge branch 'jp/use-diff-index-in-pre-commit-sample' into maint-2.43Junio C Hamano
The sample pre-commit hook that tries to catch introduction of new paths that use potentially non-portable characters did not notice an existing path getting renamed to such a problematic path, when rename detection was enabled. * jp/use-diff-index-in-pre-commit-sample: hooks--pre-commit: detect non-ASCII when renaming
2024-02-08Merge branch 'jh/trace2-redact-auth' into maint-2.43Junio C Hamano
trace2 streams used to record the URLs that potentially embed authentication material, which has been corrected. * jh/trace2-redact-auth: t0212: test URL redacting in EVENT format t0211: test URL redacting in PERF format trace2: redact passwords from https:// URLs by default trace2: fix signature of trace2_def_param() macro
2024-02-08Merge branch 'js/update-urls-in-doc-and-comment' into maint-2.43Junio C Hamano
Stale URLs have been updated to their current counterparts (or archive.org) and HTTP links are replaced with working HTTPS links. * js/update-urls-in-doc-and-comment: doc: refer to internet archive doc: update links for andre-simon.de doc: switch links to https doc: update links to current pages
2024-02-08Merge branch 'ps/commit-graph-less-paranoid' into maint-2.43Junio C Hamano
Earlier we stopped relying on commit-graph that (still) records information about commits that are lost from the object store, which has negative performance implications. The default has been flipped to disable this pessimization. * ps/commit-graph-less-paranoid: commit-graph: disable GIT_COMMIT_GRAPH_PARANOIA by default
2024-02-08Merge branch 'tz/send-email-negatable-options' into maint-2.43Junio C Hamano
Newer versions of Getopt::Long started giving warnings against our (ab)use of it in "git send-email". Bump the minimum version requirement for Perl to 5.8.1 (from September 2002) to allow simplifying our implementation. * tz/send-email-negatable-options: send-email: avoid duplicate specification warnings perl: bump the required Perl version to 5.8.1 from 5.8.0