summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-02-13Git 2.43.2v2.43.2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-02-13Merge branch 'pb/template-for-single-commit-pr' into maint-2.43Junio C Hamano
Doc update. * pb/template-for-single-commit-pr: .github/PULL_REQUEST_TEMPLATE.md: add a note about single-commit PRs
2024-02-13Merge branch 'jc/bisect-doc' into maint-2.43Junio C Hamano
Doc update. * jc/bisect-doc: bisect: document command line arguments for "bisect start" bisect: document "terms" subcommand more fully
2024-02-13Merge branch 'js/win32-retry-pipe-write-on-enospc' into maint-2.43Junio C Hamano
Update to the code that writes to pipes on Windows. * js/win32-retry-pipe-write-on-enospc: win32: special-case `ENOSPC` when writing to a pipe
2024-02-13Merge branch 'tb/pack-bitmap-drop-unused-struct-member' into maint-2.43Junio C Hamano
Code clean-up. * tb/pack-bitmap-drop-unused-struct-member: pack-bitmap: drop unused `reuse_objects`
2024-02-13Merge branch 'jt/p4-spell-re-with-raw-string' into maint-2.43Junio C Hamano
"git p4" update to squelch warnings from Python. * jt/p4-spell-re-with-raw-string: git-p4: use raw string literals for regular expressions
2024-02-13Merge branch 'jc/coc-whitespace-fix' into maint-2.43Junio C Hamano
Docfix. * jc/coc-whitespace-fix: CoC: whitespace fix
2024-02-13Merge branch 'sd/negotiate-trace-fix' into maint-2.43Junio C Hamano
Tracing fix. * sd/negotiate-trace-fix: push: region_leave trace for negotiate_using_fetch
2024-02-13Merge branch 'jc/majordomo-to-subspace' into maint-2.43Junio C Hamano
Doc update. * jc/majordomo-to-subspace: Docs: majordomo@vger.kernel.org has been decomissioned
2024-02-13Merge branch 'nb/rebase-x-shell-docfix' into maint-2.43Junio C Hamano
Doc update. * nb/rebase-x-shell-docfix: rebase: fix documentation about used shell in -x
2024-02-13Merge branch 'la/strvec-comment-fix' into maint-2.43Junio C Hamano
Comment fix. * la/strvec-comment-fix: strvec: use correct member name in comments
2024-02-13Merge branch 'ne/doc-filter-blob-limit-fix' into maint-2.43Junio C Hamano
Docfix. * ne/doc-filter-blob-limit-fix: rev-list-options: fix off-by-one in '--filter=blob:limit=<n>' explainer
2024-02-13Merge branch 'cp/git-flush-is-an-env-bool' into maint-2.43Junio C Hamano
Recent conversion to allow more than 0/1 in GIT_FLUSH broke the mechanism by flipping what yes/no means by mistake, which has been corrected. * cp/git-flush-is-an-env-bool: write-or-die: fix the polarity of GIT_FLUSH environment variable
2024-02-13Merge branch 'ps/report-failure-from-git-stash' into maint-2.43Junio C Hamano
"git stash" sometimes was silent even when it failed due to unwritable index file, which has been corrected. * ps/report-failure-from-git-stash: builtin/stash: report failure to write to index
2024-02-13Merge branch 'jc/sign-buffer-failure-propagation-fix' into maint-2.43Junio C Hamano
A failed "git tag -s" did not necessarily result in an error depending on the crypto backend, which has been corrected. * jc/sign-buffer-failure-propagation-fix: ssh signing: signal an error with a negative return value tag: fix sign_buffer() call to create a signed tag
2024-02-13Merge branch 'jc/comment-style-fixes' into maint-2.43Junio C Hamano
Rewrite //-comments to /* comments */ in files whose comments prevalently use the latter. * jc/comment-style-fixes: reftable/pq_test: comment style fix merge-ort.c: comment style fix builtin/worktree: comment style fixes
2024-02-13Merge branch 'jk/diff-external-with-no-index' into maint-2.43Junio C Hamano
"git diff --no-index file1 file2" segfaulted while invoking the external diff driver, which has been corrected. * jk/diff-external-with-no-index: diff: handle NULL meta-info when spawning external diff
2024-02-13Merge branch 'rs/parse-options-with-keep-unknown-abbrev-fix' into maint-2.43Junio C Hamano
"git diff --no-rename A B" did not disable rename detection but did not trigger an error from the command line parser. * rs/parse-options-with-keep-unknown-abbrev-fix: parse-options: simplify positivation handling parse-options: fully disable option abbreviation with PARSE_OPT_KEEP_UNKNOWN
2024-02-13Merge branch 'en/diffcore-delta-final-line-fix' into maint-2.43Junio C Hamano
Rename detection logic ignored the final line of a file if it is an incomplete line. * en/diffcore-delta-final-line-fix: diffcore-delta: avoid ignoring final 'line' of file
2024-02-13Merge branch 'tc/show-ref-exists-fix' into maint-2.43Junio C Hamano
Update to a new feature recently added, "git show-ref --exists". * tc/show-ref-exists-fix: builtin/show-ref: treat directory as non-existing in --exists
2024-02-13write-or-die: fix the polarity of GIT_FLUSH environment variableJunio C Hamano
When GIT_FLUSH is set to 1, true, on, yes, then we should disable skip_stdout_flush, but the conversion somehow did the opposite. With the understanding of the original motivation behind "skip" in 06f59e9f (Don't fflush(stdout) when it's not helpful, 2007-06-29), we can sympathize with the current naming (we wanted to avoid useless flushing of stdout by default, with an escape hatch to always flush), but it is still not a good excuse. Retire the "skip_stdout_flush" variable and replace it with "flush_stdout" that tells if we do or do not want to run fflush(). Reported-by: Xiaoguang WANG <wxiaoguang@gmail.com> Helped-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-02-12Merge branch 'pb/imap-send-wo-curl-build-fix' into maint-2.43Junio C Hamano
* pb/imap-send-wo-curl-build-fix: imap-send: add missing "strbuf.h" include under NO_CURL
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