Skip to main content

Browse the archive

swh:1:snp:bb8853bfef8fcf2b1d37fd6404912c7606c98e48
sort by:
Revision Author Date Message Commit Date
3526e67 Junio C Hamano 08 February 2024, 23:56:45 UTC Git 2.43.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> 09 February 2024, 00:22:12 UTC
963eda2 Junio C Hamano 09 February 2024, 00:22:12 UTC Merge branch 'ib/rebase-reschedule-doc' into maint-2.43 Doc update. * ib/rebase-reschedule-doc: rebase: clarify --reschedule-failed-exec default 09 February 2024, 00:22:12 UTC
a064af6 Junio C Hamano 09 February 2024, 00:22:12 UTC Merge branch 'jk/index-pack-lsan-false-positive-fix' into maint-2.43 Fix false positive reported by leak sanitizer. * jk/index-pack-lsan-false-positive-fix: index-pack: spawn threads atomically 09 February 2024, 00:22:12 UTC
16a830f Junio C Hamano 09 February 2024, 00:22:12 UTC Merge branch 'cp/sideband-array-index-comment-fix' into maint-2.43 In-code comment fix. * cp/sideband-array-index-comment-fix: sideband.c: remove redundant 'NEEDSWORK' tag 09 February 2024, 00:22:12 UTC
d690c8e Junio C Hamano 09 February 2024, 00:22:11 UTC Merge branch 'ms/rebase-insnformat-doc-fix' into maint-2.43 Docfix. * ms/rebase-insnformat-doc-fix: Documentation: fix statement about rebase.instructionFormat 09 February 2024, 00:22:12 UTC
5b49c1a Junio C Hamano 09 February 2024, 00:22:11 UTC Merge branch 'jx/sideband-chomp-newline-fix' into maint-2.43 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 09 February 2024, 00:22:11 UTC
fb3ead6 Junio C Hamano 09 February 2024, 00:22:11 UTC Merge branch 'jk/t1006-cat-file-objectsize-disk' into maint-2.43 Test update. * jk/t1006-cat-file-objectsize-disk: t1006: prefer shell loop to awk for packed object sizes t1006: add tests for %(objectsize:disk) 09 February 2024, 00:22:11 UTC
5a322a2 Junio C Hamano 09 February 2024, 00:22:11 UTC Merge branch 'js/contributor-docs-updates' into maint-2.43 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 09 February 2024, 00:22:11 UTC
232953b Junio C Hamano 09 February 2024, 00:22:10 UTC Merge branch 'rs/fast-import-simplify-mempool-allocation' into maint-2.43 Code simplification. * rs/fast-import-simplify-mempool-allocation: fast-import: use mem_pool_calloc() 09 February 2024, 00:22:11 UTC
0f7a10a Junio C Hamano 09 February 2024, 00:22:10 UTC Merge branch 'en/header-cleanup' into maint-2.43 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 09 February 2024, 00:22:10 UTC
3aea0da Junio C Hamano 09 February 2024, 00:22:10 UTC Merge branch 'ml/doc-merge-updates' into maint-2.43 Doc update. * ml/doc-merge-updates: Documentation/git-merge.txt: use backticks for command wrapping Documentation/git-merge.txt: fix reference to synopsis 09 February 2024, 00:22:10 UTC
974c936 Junio C Hamano 09 February 2024, 00:22:09 UTC Merge branch 'jc/orphan-unborn' into maint-2.43 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 09 February 2024, 00:22:10 UTC
541d0d7 Junio C Hamano 09 February 2024, 00:22:09 UTC Merge branch 'la/trailer-cleanups' into maint-2.43 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 09 February 2024, 00:22:09 UTC
edf4c0d Junio C Hamano 09 February 2024, 00:22:09 UTC Merge branch 'jc/retire-cas-opt-name-constant' into maint-2.43 Code clean-up. * jc/retire-cas-opt-name-constant: remote.h: retire CAS_OPT_NAME 09 February 2024, 00:22:09 UTC
2873a96 Junio C Hamano 09 February 2024, 00:22:09 UTC Merge branch 'rs/rebase-use-strvec-pushf' into maint-2.43 Code clean-up. * rs/rebase-use-strvec-pushf: rebase: use strvec_pushf() for format-patch revisions 09 February 2024, 00:22:09 UTC
f5fa75a Junio C Hamano 09 February 2024, 00:22:08 UTC Merge branch 'rs/t6300-compressed-size-fix' into maint-2.43 Test fix. * rs/t6300-compressed-size-fix: t6300: avoid hard-coding object sizes 09 February 2024, 00:22:09 UTC
bb58c03 Junio C Hamano 09 February 2024, 00:22:08 UTC Merge branch 'sp/test-i18ngrep' into maint-2.43 Error message fix in the test framework. * sp/test-i18ngrep: test-lib-functions.sh: fix test_grep fail message wording 09 February 2024, 00:22:08 UTC
a1121a7 Junio C Hamano 09 February 2024, 00:22:08 UTC Merge branch 'jc/doc-misspelt-refs-fix' into maint-2.43 Doc update. * jc/doc-misspelt-refs-fix: doc: format.notes specify a ref under refs/notes/ hierarchy 09 February 2024, 00:22:08 UTC
79f79e5 Junio C Hamano 09 February 2024, 00:22:08 UTC Merge branch 'jc/doc-most-refs-are-not-that-special' into maint-2.43 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 09 February 2024, 00:22:08 UTC
7b95c64 Junio C Hamano 09 February 2024, 00:22:07 UTC Merge branch 'es/add-doc-list-short-form-of-all-in-synopsis' into maint-2.43 Doc update. * es/add-doc-list-short-form-of-all-in-synopsis: git-add.txt: add missing short option -A to synopsis 09 February 2024, 00:22:08 UTC
b1184c3 Junio C Hamano 09 February 2024, 00:22:07 UTC Merge branch 'ps/chainlint-self-check-update' into maint-2.43 Test framework update. * ps/chainlint-self-check-update: tests: adjust whitespace in chainlint expectations 09 February 2024, 00:22:07 UTC
546f8d2 Junio C Hamano 09 February 2024, 00:22:07 UTC Merge branch 'ps/reftable-fixes' into maint-2.43 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 09 February 2024, 00:22:07 UTC
b471ea3 Junio C Hamano 09 February 2024, 00:22:07 UTC Merge branch 'jk/config-cleanup' into maint-2.43 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 09 February 2024, 00:22:07 UTC
6479e12 Junio C Hamano 09 February 2024, 00:22:06 UTC Merge branch 'rs/incompatible-options-messages' into maint-2.43 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 09 February 2024, 00:22:06 UTC
1dbc469 Junio C Hamano 09 February 2024, 00:22:06 UTC Merge branch 'mk/doc-gitfile-more' into maint-2.43 Doc update. * mk/doc-gitfile-more: doc: make the gitfile syntax easier to discover 09 February 2024, 00:22:06 UTC
67bb8ff Junio C Hamano 09 February 2024, 00:22:06 UTC Merge branch 'ps/ref-tests-update-more' into maint-2.43 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 09 February 2024, 00:22:06 UTC
a7ea468 Junio C Hamano 09 February 2024, 00:22:06 UTC Merge branch 'rs/column-leakfix' into maint-2.43 Leakfix. * rs/column-leakfix: column: release strbuf and string_list after use 09 February 2024, 00:22:06 UTC
25e2039 Junio C Hamano 09 February 2024, 00:22:05 UTC Merge branch 'rs/i18n-cannot-be-used-together' into maint-2.43 Clean-up code that handles combinations of incompatible options. * rs/i18n-cannot-be-used-together: i18n: factorize even more 'incompatible options' messages 09 February 2024, 00:22:05 UTC
173d774 Junio C Hamano 09 February 2024, 00:22:05 UTC Merge branch 'jb/reflog-expire-delete-dry-run-options' into maint-2.43 Command line parsing fix for "git reflog". * jb/reflog-expire-delete-dry-run-options: builtin/reflog.c: fix dry-run option short name 09 February 2024, 00:22:05 UTC
bcab40f Junio C Hamano 09 February 2024, 00:22:05 UTC Merge branch 'js/packfile-h-typofix' into maint-2.43 Typofix. * js/packfile-h-typofix: packfile.c: fix a typo in `each_file_in_pack_dir_fn()`'s declaration 09 February 2024, 00:22:05 UTC
1685e9f Junio C Hamano 09 February 2024, 00:22:05 UTC Merge branch 'jk/commit-graph-slab-clear-fix' into maint-2.43 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 09 February 2024, 00:22:05 UTC
3c2ee13 Junio C Hamano 09 February 2024, 00:22:04 UTC Merge branch 'cp/git-flush-is-an-env-bool' into maint-2.43 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 09 February 2024, 00:22:04 UTC
8566311 Junio C Hamano 09 February 2024, 00:22:04 UTC Merge branch 'jc/sparse-checkout-set-default-fix' into maint-2.43 "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 09 February 2024, 00:22:04 UTC
878f8c4 Junio C Hamano 09 February 2024, 00:22:04 UTC Merge branch 'jc/archive-list-with-extra-args' into maint-2.43 "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 09 February 2024, 00:22:04 UTC
a593e2f Junio C Hamano 09 February 2024, 00:22:04 UTC Merge branch 'rj/status-bisect-while-rebase' into maint-2.43 "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 09 February 2024, 00:22:04 UTC
8f7cc56 Junio C Hamano 09 February 2024, 00:22:04 UTC Merge branch 'sh/completion-with-reftable' into maint-2.43 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 09 February 2024, 00:22:04 UTC
ce54593 Junio C Hamano 09 February 2024, 00:22:03 UTC Merge branch 'jx/fetch-atomic-error-message-fix' into maint-2.43 "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 09 February 2024, 00:22:03 UTC
0e92593 Junio C Hamano 09 February 2024, 00:22:03 UTC Merge branch 'jk/mailinfo-iterative-unquote-comment' into maint-2.43 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() 09 February 2024, 00:22:03 UTC
952916f Junio C Hamano 09 February 2024, 00:22:03 UTC Merge branch 'rs/show-ref-incompatible-options' into maint-2.43 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() 09 February 2024, 00:22:03 UTC
28b4745 Junio C Hamano 09 February 2024, 00:22:03 UTC Merge branch 'jk/implicit-true' into maint-2.43 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 09 February 2024, 00:22:03 UTC
5baedc6 Junio C Hamano 09 February 2024, 00:22:02 UTC Merge branch 'jk/bisect-reset-fix' into maint-2.43 "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 09 February 2024, 00:22:03 UTC
19fa15f Junio C Hamano 09 February 2024, 00:22:02 UTC Merge branch 'jk/end-of-options' into maint-2.43 "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 "--" 09 February 2024, 00:22:02 UTC
4b50f86 Junio C Hamano 09 February 2024, 00:22:02 UTC Merge branch 'jc/revision-parse-int' into maint-2.43 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 09 February 2024, 00:22:02 UTC
7c05241 Junio C Hamano 09 February 2024, 00:22:02 UTC Merge branch 'jp/use-diff-index-in-pre-commit-sample' into maint-2.43 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 09 February 2024, 00:22:02 UTC
13031f6 Junio C Hamano 09 February 2024, 00:22:01 UTC Merge branch 'jh/trace2-redact-auth' into maint-2.43 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 09 February 2024, 00:22:01 UTC
efbae05 Junio C Hamano 09 February 2024, 00:22:01 UTC Merge branch 'js/update-urls-in-doc-and-comment' into maint-2.43 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 09 February 2024, 00:22:01 UTC
50b8f51 Junio C Hamano 09 February 2024, 00:22:01 UTC Merge branch 'ps/commit-graph-less-paranoid' into maint-2.43 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 09 February 2024, 00:22:01 UTC
f8e2ad9 Junio C Hamano 09 February 2024, 00:22:00 UTC Merge branch 'tz/send-email-negatable-options' into maint-2.43 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 09 February 2024, 00:22:01 UTC
c8bcf66 Junio C Hamano 09 February 2024, 00:22:00 UTC Merge branch 'js/ci-discard-prove-state' into maint-2.43 The way CI testing used "prove" could lead to running the test suite twice needlessly, which has been corrected. * js/ci-discard-prove-state: ci: avoid running the test suite _twice_ ci: add support for GitLab CI ci: install test dependencies for linux-musl ci: squelch warnings when testing with unusable Git repo ci: unify setup of some environment variables ci: split out logic to set up failed test artifacts ci: group installation of Docker dependencies ci: make grouping setup more generic ci: reorder definitions for grouping functions 09 February 2024, 00:22:00 UTC
25aec06 Illia Bobyr 05 January 2024, 01:14:26 UTC rebase: clarify --reschedule-failed-exec default Documentation should mention the default behavior. It is better to explain the persistent nature of the --reschedule-failed-exec flag from the user standpoint, rather than from the implementation standpoint. Signed-off-by: Illia Bobyr <illia.bobyr@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 05 January 2024, 17:41:25 UTC
993d38a Jeff King 05 January 2024, 08:50:34 UTC index-pack: spawn threads atomically The t5309 script triggers a racy false positive with SANITIZE=leak on a multi-core system. Running with "--stress --run=6" usually fails within 10 seconds or so for me, complaining with something like: + git index-pack --fix-thin --stdin fatal: REF_DELTA at offset 46 already resolved (duplicate base 01d7713666f4de822776c7622c10f1b07de280dc?) ================================================================= ==3904583==ERROR: LeakSanitizer: detected memory leaks Direct leak of 32 byte(s) in 1 object(s) allocated from: #0 0x7fa790d01986 in __interceptor_realloc ../../../../src/libsanitizer/lsan/lsan_interceptors.cpp:98 #1 0x7fa790add769 in __pthread_getattr_np nptl/pthread_getattr_np.c:180 #2 0x7fa790d117c5 in __sanitizer::GetThreadStackTopAndBottom(bool, unsigned long*, unsigned long*) ../../../../src/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cpp:150 #3 0x7fa790d11957 in __sanitizer::GetThreadStackAndTls(bool, unsigned long*, unsigned long*, unsigned long*, unsigned long*) ../../../../src/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cpp:598 #4 0x7fa790d03fe8 in __lsan::ThreadStart(unsigned int, unsigned long long, __sanitizer::ThreadType) ../../../../src/libsanitizer/lsan/lsan_posix.cpp:51 #5 0x7fa790d013fd in __lsan_thread_start_func ../../../../src/libsanitizer/lsan/lsan_interceptors.cpp:440 #6 0x7fa790adc3eb in start_thread nptl/pthread_create.c:444 #7 0x7fa790b5ca5b in clone3 ../sysdeps/unix/sysv/linux/x86_64/clone3.S:81 SUMMARY: LeakSanitizer: 32 byte(s) leaked in 1 allocation(s). Aborted What happens is this: 0. We construct a bogus pack with a duplicate object in it and trigger index-pack. 1. We spawn a bunch of worker threads to resolve deltas (on my system it is 16 threads). 2. One of the threads sees the duplicate object and bails by calling exit(), taking down all of the threads. This is expected and is the point of the test. 3. At the time exit() is called, we may still be spawning threads from the main process via pthread_create(). LSan hooks thread creation to update its book-keeping; it has to know where each thread's stack is (so it can find entry points for reachable memory). So it calls pthread_getattr_np() to get information about the new thread. That may allocate memory that must be freed with a matching call to pthread_attr_destroy(). Probably LSan does that immediately, but if you're unlucky enough, the exit() will happen while it's between those two calls, and the allocated pthread_attr_t appears as a leak. This isn't a real leak. It's not even in our code, but rather in the LSan instrumentation code. So we could just ignore it. But the false positive can cause people to waste time tracking it down. It's possibly something that LSan could protect against (e.g., cover the getattr/destroy pair with a mutex, and then in the final post-exit() check for leaks try to take the same mutex). But I don't know enough about LSan to say if that's a reasonable approach or not (or if my analysis is even completely correct). In the meantime, it's pretty easy to avoid the race by making creation of the worker threads "atomic". That is, we'll spawn all of them before letting any of them start to work. That's easy to do because we already have a work_lock() mutex for handing out that work. If the main process takes it, then all of the threads will immediately block until we've finished spawning and released it. This shouldn't make any practical difference for non-LSan runs. The thread spawning is quick, and could happen before any worker thread gets scheduled anyway. Probably other spots that use threads are subject to the same issues. But since we have to manually insert locking (and since this really is kind of a hack), let's not bother with them unless somebody experiences a similar racy false-positive in practice. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 05 January 2024, 16:40:56 UTC
d70f554 Jeff King 05 January 2024, 05:41:42 UTC commit-graph: retain commit slab when closing NULL commit_graph This fixes a regression introduced in ac6d45d11f (commit-graph: move slab-clearing to close_commit_graph(), 2023-10-03), in which running: git -c fetch.writeCommitGraph=true fetch --recurse-submodules multiple times in a freshly cloned repository causes a segfault. What happens in the second (and subsequent) runs is this: 1. We make a "struct commit" for any ref tips which we're storing (even if we already have them, they still go into FETCH_HEAD). Because the first run will have created a commit graph, we'll find those commits in the graph. The commit struct is therefore created with a NULL "maybe_tree" entry, because we can load its oid from the graph later. But to do that we need to remember that we got the commit from the graph, which is recorded in a global commit_graph_data_slab object. 2. Because we're using --recurse-submodules, we'll try to fetch each of the possible submodules. That implies creating a separate "struct repository" in-process for each submodule, which will require a later call to repo_clear(). The call to repo_clear() calls raw_object_store_clear(), which in turn calls close_object_store(), which in turn calls close_commit_graph(). And the latter frees the commit graph data slab. 3. Later, when trying to write out a new commit graph, we'll ask for their tree oid via get_commit_tree_oid(), which will see that the object is parsed but with a NULL maybe_tree field. We'd then usually pull it from the graph file, but because the slab was cleared, we don't realize that we can do so! We end up returning NULL and segfaulting. (It seems questionable that we'd write a graph entry for such a commit anyway, since we know we already have one. I didn't double-check, but that may simply be another side effect of having cleared the slab). The bug is in step (2) above. We should not be clearing the slab when cleaning up the submodule repository structs. Prior to ac6d45d11f, we did not do so because it was done inside a helper function that returned early when it saw NULL. So the behavior change from that commit is that we'll now _always_ clear the slab via repo_clear(), even if the repository being closed did not have a commit graph (and thus would have a NULL commit_graph struct). The most immediate fix is to add in a NULL check in close_commit_graph(), making it a true noop when passed in an object_store with a NULL commit_graph (it's OK to just return early, since the rest of its code is already a noop when passed NULL). That restores the pre-ac6d45d11f behavior. And that's what this patch does, along with a test that exercises it (we already have a test that uses submodules along with fetch.writeCommitGraph, but the bug only triggers when there is a subsequent fetch and when that fetch uses --recurse-submodules). So that fixes the regression in the least-risky way possible. I do think there's some fragility here that we might want to follow up on. We have a global commit_graph_data_slab that contains graph positions, and our global commit structs depend on the that slab remaining valid. But close_commit_graph() is just about closing _one_ object store's graph. So it's dangerous to call that function and clear the slab without also throwing away any "struct commit" we might have parsed that depends on it. Which at first glance seems like a bug we could already trigger. In the situation described here, there is no commit graph in the submodule repository, so our commit graph is NULL (in fact, in our test script there is no submodule repo at all, so we immediately return from repo_init() and call repo_clear() only to free up memory). But what would happen if there was one? Wouldn't we see a non-NULL commit_graph entry, and then clear the global slab anyway? The answer is "no", but for very bizarre reasons. Remember that repo_clear() calls raw_object_store_clear(), which then calls close_object_store() and thus close_commit_graph(). But before it does so, raw_object_store_clear() does something else: it frees the commit graph and sets it to NULL! So by this code path we'll _never_ see a non-NULL commit_graph struct, and thus never clear the slab. So it happens to work out. But it still seems questionable to me that we would clear a global slab (which might still be in use) when closing the commit graph. This clearing comes from 957ba814bf (commit-graph: when closing the graph, also release the slab, 2021-09-08), and was fixing a case where we really did need it to be closed (and in that case we presumably call close_object_store() more directly). So I suspect there may still be a bug waiting to happen there, as any object loaded before the call to close_object_store() may be stranded with a bogus maybe_tree entry (and thus looking at it after the call might cause an error). But I'm not sure how to trigger it, nor what the fix should look like (you probably would need to "unparse" any objects pulled from the graph). And so this patch punts on that for now in favor of fixing the recent regression in the most direct way, which should not have any other fallouts. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 05 January 2024, 16:35:26 UTC
556e680 Chandra Pratap 04 January 2024, 10:20:17 UTC write-or-die: make GIT_FLUSH a Boolean environment variable Among Git's environment variables, the ones marked as "Boolean" accept values in a way similar to Boolean configuration variables, i.e. values like 'yes', 'on', 'true' and positive numbers are taken as "on" and values like 'no', 'off', 'false' are taken as "off". GIT_FLUSH can be used to force Git to use non-buffered I/O when writing to stdout. It can only accept two values, '1' which causes Git to flush more often and '0' which makes all output buffered. Make GIT_FLUSH accept more values besides '0' and '1' by turning it into a Boolean environment variable, modifying the required logic. Update the related documentation. Signed-off-by: Chandra Pratap <chandrapratap3519@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 January 2024, 18:32:21 UTC
9cd30af Maarten van der Schrieck 03 January 2024, 18:14:23 UTC Documentation: fix statement about rebase.instructionFormat Since commit 62db5247 (rebase -i: generate the script via rebase--helper, 2017-07-14), the short hash is given in rebase-todo. Specifying rebase.instructionFormat does not alter this behavior, contrary to what the documentation implies. Signed-off-by: Maarten van der Schrieck <maarten@thingsconnected.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com> 03 January 2024, 19:21:15 UTC
54d8a25 René Scharfe 03 January 2024, 09:01:52 UTC t1006: prefer shell loop to awk for packed object sizes To compute the expected on-disk size of packed objects, we sort the output of show-index by pack offset and then compute the difference between adjacent entries using awk. This works but has a few readability problems: 1. Reading the index in pack order means don't find out the size of an oid's entry until we see the _next_ entry. So we have to save it to print later. We can instead iterate in reverse order, so we compute each oid's size as we see it. 2. Since the awk invocation is inside a text_expect block, we can't easily use single-quotes to hold the script. So we use double-quotes, but then have to escape the dollar signs in the awk script. We can swap this out for a shell loop instead (which is made much easier by the first change). Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 03 January 2024, 17:26:53 UTC
03bcc93 Chandra Pratap 28 December 2023, 08:01:00 UTC sideband.c: remove redundant 'NEEDSWORK' tag Signed-off-by: Chandra Pratap <chandrapratap3519@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 December 2023, 15:59:12 UTC
291873e Josh Soref 28 December 2023, 04:55:24 UTC SubmittingPatches: hyphenate non-ASCII Git documentation does this with the exception of ancient release notes. Signed-off-by: Josh Soref <jsoref@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 December 2023, 05:33:24 UTC
7818951 Josh Soref 28 December 2023, 04:55:23 UTC SubmittingPatches: clarify GitHub artifact format GitHub wraps artifacts generated by workflows in a .zip file. Internally, workflows can package anything they like in them. A recently generated failure artifact had the form: windows-artifacts.zip Length Date Time Name --------- ---------- ----- ---- 76001695 12-19-2023 01:35 artifacts.tar.gz 11005650 12-19-2023 01:35 tracked.tar.gz --------- ------- 87007345 2 files Signed-off-by: Josh Soref <jsoref@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 December 2023, 05:33:24 UTC
0771a3b Josh Soref 28 December 2023, 04:55:22 UTC SubmittingPatches: clarify GitHub visual GitHub has two general forms for its states, sometimes they're a simple colored object (e.g. green check or red x), and sometimes there's also a colored container (e.g. green box or red circle) which contains that object (e.g. check or x). That's a lot of words to try to describe things, but in general, the key for a failure is that it's recognized as an `x` and that it's associated with the color red -- the color of course is problematic for people who are red-green color-blind, but that's why they are paired with distinct shapes. Signed-off-by: Josh Soref <jsoref@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 December 2023, 05:33:24 UTC
08e2e6f Josh Soref 28 December 2023, 04:55:21 UTC SubmittingPatches: provide tag naming advice Current statistics show a strong preference to only capitalize the first letter in a hyphenated tag, but that some guidance would be helpful: git log | perl -ne 'next unless /^\s+(?:Signed-[oO]ff|Acked)-[bB]y:/; s/^\s+//;s/:.*/:/;print'| sort|uniq -c|sort -n 2 Signed-off-By: 4 Signed-Off-by: 22 Acked-By: 47 Signed-Off-By: 2202 Acked-by: 95315 Signed-off-by: Signed-off-by: Josh Soref <jsoref@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 December 2023, 05:33:23 UTC
c771ef6 Josh Soref 28 December 2023, 04:55:20 UTC SubmittingPatches: update extra tags list Add items with at least 100 uses in the past three years: - Co-authored-by - Helped-by - Mentored-by - Suggested-by git log --since=3.years| perl -ne 'next unless /^\s+[A-Z][a-z]+-\S+:/;s/^\s+//;s/:.*/:/;print'| sort|uniq -c|sort -n|grep '[0-9][0-9] ' 14 Based-on-patch-by: 14 Original-patch-by: 17 Tested-by: 100 Suggested-by: 121 Co-authored-by: 163 Mentored-by: 274 Reported-by: 290 Acked-by: 450 Helped-by: 602 Reviewed-by: 14111 Signed-off-by: Signed-off-by: Josh Soref <jsoref@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 December 2023, 05:33:23 UTC
ac9fff2 Josh Soref 28 December 2023, 04:55:19 UTC SubmittingPatches: discourage new trailers There seems to be consensus amongst the core Git community on a working set of common trailers, and there are non-trivial costs to people inventing new trailers (research to discover what they mean/how they differ from existing trailers) such that inventing new ones is generally unwarranted and not something to be recommended to new contributors. Suggested-by: Elijah Newren <newren@gmail.com> Signed-off-by: Josh Soref <jsoref@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 December 2023, 05:33:23 UTC
1271062 Josh Soref 28 December 2023, 04:55:18 UTC SubmittingPatches: drop ref to "What's in git.git" "What's in git.git" was last seen in 2010: https://lore.kernel.org/git/?q=%22what%27s+in+git.git%22 https://lore.kernel.org/git/7vaavikg72.fsf@alter.siamese.dyndns.org/ Signed-off-by: Josh Soref <jsoref@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 December 2023, 05:33:23 UTC
e6397c5 Josh Soref 28 December 2023, 04:55:17 UTC CodingGuidelines: write punctuation marks - Match style in Release Notes Signed-off-by: Josh Soref <jsoref@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 December 2023, 05:33:23 UTC
2d19454 Josh Soref 28 December 2023, 04:55:16 UTC CodingGuidelines: move period inside parentheses The contents within parenthesis should be omittable without resulting in broken text. Eliding the parenthesis left a period to end a run without any content. Signed-off-by: Josh Soref <jsoref@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 December 2023, 05:33:23 UTC
53ded83 Junio C Hamano 21 December 2023, 06:59:24 UTC sparse-checkout: use default patterns for 'set' only !stdin "git sparse-checkout set ---no-cone" uses default patterns when none is given from the command line, but it should do so ONLY when --stdin is not being used. Right now, add_patterns_from_input() called when reading from the standard input is sloppy and does not check if there are extra command line parameters that the command will silently ignore, but that will change soon and not setting this unnecessary and unused default patterns start to matter when it gets fixed. Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 December 2023, 20:15:58 UTC
d57c671 Elijah Newren 23 December 2023, 17:15:00 UTC treewide: remove unnecessary includes in source files Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 December 2023, 20:04:33 UTC
ec2101a Elijah Newren 23 December 2023, 17:14:59 UTC treewide: add direct includes currently only pulled in transitively The next commit will remove a bunch of unnecessary includes, but to do so, we need some of the lower level direct includes that files rely on to be explicitly specified. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 December 2023, 20:04:32 UTC
0a4d5b9 Elijah Newren 23 December 2023, 17:14:58 UTC trace2/tr2_tls.h: remove unnecessary include The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 December 2023, 20:04:32 UTC
e9bb166 Elijah Newren 23 December 2023, 17:14:57 UTC submodule-config.h: remove unnecessary include The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 December 2023, 20:04:32 UTC
545f7b5 Elijah Newren 23 December 2023, 17:14:56 UTC pkt-line.h: remove unnecessary include The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 December 2023, 20:04:32 UTC
a28fe2d Elijah Newren 23 December 2023, 17:14:55 UTC line-log.h: remove unnecessary include The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 December 2023, 20:04:32 UTC
f25e65e Elijah Newren 23 December 2023, 17:14:54 UTC http.h: remove unnecessary include The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 December 2023, 20:04:32 UTC
31d20fa Elijah Newren 23 December 2023, 17:14:53 UTC fsmonitor--daemon.h: remove unnecessary includes The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 December 2023, 20:04:32 UTC
bd6cc1d Elijah Newren 23 December 2023, 17:14:52 UTC blame.h: remove unnecessary includes The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 December 2023, 20:04:32 UTC
c2c4138 Elijah Newren 23 December 2023, 17:14:51 UTC archive.h: remove unnecessary include The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 December 2023, 20:04:31 UTC
eea0e59 Elijah Newren 23 December 2023, 17:14:50 UTC treewide: remove unnecessary includes in source files Each of these were checked with gcc -E -I. ${SOURCE_FILE} | grep ${HEADER_FILE} to ensure that removing the direct inclusion of the header actually resulted in that header no longer being included at all (i.e. that no other header pulled it in transitively). ...except for a few cases where we verified that although the header was brought in transitively, nothing from it was directly used in that source file. These cases were: * builtin/credential-cache.c * builtin/pull.c * builtin/send-pack.c Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 December 2023, 20:04:31 UTC
147438e Elijah Newren 23 December 2023, 17:14:49 UTC treewide: remove unnecessary includes from header files There are three kinds of unnecessary includes: * includes which aren't directly needed, but which include some other forgotten include * includes which could be replaced by a simple forward declaration of some structs * includes which aren't needed at all Remove the third kind of include. Subsequent commits (and a subsequent series) will work on removing some of the other kinds of includes. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 December 2023, 20:04:31 UTC
5b7eec4 René Scharfe 26 December 2023, 08:17:45 UTC fast-import: use mem_pool_calloc() Use mem_pool_calloc() to get a zeroed buffer instead of zeroing it ourselves. This makes the code clearer and less repetitive. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 December 2023, 19:06:23 UTC
f546151 Jeff King 21 December 2023, 09:47:22 UTC t1006: add tests for %(objectsize:disk) Back when we added this placeholder in a4ac106178 (cat-file: add %(objectsize:disk) format atom, 2013-07-10), there were no tests, claiming "[...]the exact numbers returned are volatile and subject to zlib and packing decisions". But we can use a little shell hackery to get the expected numbers ourselves. To a certain degree this is just re-implementing what Git is doing under the hood, but it is still worth doing. It makes sure we exercise the %(objectsize:disk) code at all, and having the two implementations agree gives us more confidence. Note that our shell code assumes that no object appears twice (either in two packs, or as both loose and packed), as then the results really are undefined. That's OK for our purposes, and the test will notice if that assumption is violated (the shell version would produce duplicate lines that Git's output does not have). Helped-by: René Scharfe <l.s.r@web.de> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 December 2023, 18:37:46 UTC
d6b6cd1 Junio C Hamano 21 December 2023, 18:13:58 UTC archive: "--list" does not take further options "git archive --list blah" should notice an extra command line parameter that goes unused. Make it so. Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 December 2023, 18:33:09 UTC
63956c5 Michael Lohmann 20 December 2023, 19:53:42 UTC Documentation/git-merge.txt: use backticks for command wrapping As René found in the guidance from CodingGuidelines: Literal examples (e.g. use of command-line options, command names, branch names, URLs, pathnames (files and directories), configuration and environment variables) must be typeset in monospace (i.e. wrapped with backticks) So all instances of single and double quotes for wraping said examples were replaced with simple backticks. Suggested-by: René Scharfe <l.s.r@web.de> Signed-off-by: Michael Lohmann <mi.al.lohmann@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 December 2023, 21:40:01 UTC
dc18ead Michael Lohmann 20 December 2023, 21:35:34 UTC Documentation/git-merge.txt: fix reference to synopsis 437591a9d738 combined the synopsis of "The second syntax" (meaning `git merge --abort`) and "The third syntax" (for `git merge --continue`) into this single line: git merge (--continue | --abort | --quit) but it was still referred to when describing the preconditions that have to be fulfilled to run the respective actions. In other words: References by number are no longer valid after a merge of some of the synopses. Also the previous version of the documentation did not acknowledge that `--no-commit` would result in the precondition being fulfilled (thanks to Elijah Newren and Junio C Hamano for pointing that out). This change also groups `--abort` and `--continue` together when explaining the prerequisites in order to avoid duplication. Helped-by: René Scharfe <l.s.r@web.de> Signed-off-by: Michael Lohmann <mi.al.lohmann@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 December 2023, 21:39:56 UTC
de7c27a Linus Arver 20 October 2023, 19:01:35 UTC trailer: use offsets for trailer_start/trailer_end Previously these fields in the trailer_info struct were of type "const char *" and pointed to positions in the input string directly (to the start and end positions of the trailer block). Use offsets to make the intended usage less ambiguous. We only need to reference the input string in format_trailer_info(), so update that function to take a pointer to the input. While we're at it, rename trailer_start to trailer_block_start to be more explicit about these offsets (that they are for the entire trailer block including other trailers). Ditto for trailer_end. Reported-by: Glen Choo <glencbz@gmail.com> Signed-off-by: Linus Arver <linusa@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 December 2023, 19:55:04 UTC
97e9d0b Linus Arver 20 October 2023, 19:01:34 UTC trailer: find the end of the log message Previously, trailer_info_get() computed the trailer block end position by (1) checking for the opts->no_divider flag and optionally calling find_patch_start() to find the "patch start" location (patch_start), and (2) calling find_trailer_end() to find the end of the trailer block using patch_start as a guide, saving the return value into "trailer_end". The logic in (1) was awkward because the variable "patch_start" is misleading if there is no patch in the input. The logic in (2) was misleading because it could be the case that no trailers are in the input (yet we are setting a "trailer_end" variable before even searching for trailers, which happens later in find_trailer_start()). The name "find_trailer_end" was misleading because that function did not look for any trailer block itself --- instead it just computed the end position of the log message in the input where the end of the trailer block (if it exists) would be (because trailer blocks must always come after the end of the log message). Combine the logic in (1) and (2) together into find_patch_start() by renaming it to find_end_of_log_message(). The end of the log message is the starting point which find_trailer_start() needs to start searching backward to parse individual trailers (if any). Helped-by: Jonathan Tan <jonathantanmy@google.com> Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Linus Arver <linusa@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 December 2023, 19:55:04 UTC
45184af René Scharfe 19 December 2023, 07:42:18 UTC rebase: use strvec_pushf() for format-patch revisions In run_am(), a strbuf is used to create a revision argument that is then added to the argument list for git format-patch using strvec_push(). Use strvec_pushf() to add it directly instead, simplifying the code and plugging a small leak on the error code path. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 December 2023, 17:26:58 UTC
44dbb3b Stan Hu 19 December 2023, 22:14:18 UTC completion: support pseudoref existence checks for reftables In contrib/completion/git-completion.bash, there are a bunch of instances where we read pseudorefs, such as HEAD, MERGE_HEAD, REVERT_HEAD, and others via the filesystem. However, the upcoming reftable refs backend won't use '.git/HEAD' at all but instead will write an invalid refname as placeholder for backwards compatibility, which will break the git-completion script. Update the '__git_pseudoref_exists' function to: 1. Recognize the placeholder '.git/HEAD' written by the reftable backend (its content is specified in the reftable specs). 2. If reftable is in use, use 'git rev-parse' to determine whether the given ref exists. 3. Otherwise, continue to use 'test -f' to check for the ref's filename. Signed-off-by: Stan Hu <stanhu@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 December 2023, 23:11:58 UTC
666270a Stan Hu 19 December 2023, 22:14:17 UTC completion: refactor existence checks for pseudorefs In preparation for the reftable backend, this commit introduces a '__git_pseudoref_exists' function that continues to use 'test -f' to determine whether a given pseudoref exists in the local filesystem. Signed-off-by: Stan Hu <stanhu@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 December 2023, 23:11:56 UTC
a762af3 Junio C Hamano 19 December 2023, 19:26:25 UTC remote.h: retire CAS_OPT_NAME When the "--force-with-lease" option was introduced in 28f5d176 (remote.c: add command line option parser for "--force-with-lease", 2013-07-08), the design discussion revolved around the concept of "compare-and-swap", and it can still be seen in the name used for variables and helper functions. The end-user facing option name ended up to be a bit different, so during the development iteration of the feature, we used this C preprocessor macro to make it easier to rename it later. All of that happened more than 10 years ago, and the flexibility afforded by the CAS_OPT_NAME macro outlived its usefulness. Inline the constant string for the option name, like all other option names in the code. Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 December 2023, 19:27:04 UTC
7033d54 Jiang Xin 17 December 2023, 14:41:38 UTC pkt-line: do not chomp newlines for sideband messages When calling "packet_read_with_status()" to parse pkt-line encoded packets, we can turn on the flag "PACKET_READ_CHOMP_NEWLINE" to chomp newline character for each packet for better line matching. But when receiving data and progress information using sideband, we should turn off the flag "PACKET_READ_CHOMP_NEWLINE" to prevent mangling newline characters from data and progress information. When both the server and the client support "sideband-all" capability, we have a dilemma that newline characters in negotiation packets should be removed, but the newline characters in the progress information should be left intact. Add new flag "PACKET_READ_USE_SIDEBAND" for "packet_read_with_status()" to prevent mangling newline characters in sideband messages. Helped-by: Jonathan Tan <jonathantanmy@google.com> Helped-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 December 2023, 21:24:38 UTC
64220dc Jiang Xin 17 December 2023, 14:41:37 UTC pkt-line: memorize sideband fragment in reader When we turn on the "use_sideband" field of the packet_reader, "packet_reader_read()" will call the function "demultiplex_sideband()" to parse and consume sideband messages. Sideband fragment which does not end with "\r" or "\n" will be saved in the sixth parameter "scratch" and it can be reused and be concatenated when parsing another sideband message. In "packet_reader_read()" function, the local variable "scratch" can only be reused by subsequent sideband messages. But if there is a payload message between two sideband fragments, the first fragment which is saved in the local variable "scratch" will be lost. To solve this problem, we can add a new field "scratch" in packet_reader to memorize the sideband fragment across different calls of "packet_reader_read()". Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 December 2023, 21:24:37 UTC
eaa82f8 Jiang Xin 17 December 2023, 14:41:36 UTC test-pkt-line: add option parser for unpack-sideband We can use the test helper program "test-tool pkt-line" to test pkt-line related functions. E.g.: * Use "test-tool pkt-line send-split-sideband" to generate sideband messages. * Pipe these generated sideband messages to command "test-tool pkt-line unpack-sideband" to test packet_reader_read() function. In order to make a complete test of the packet_reader_read() function, add option parser for command "test-tool pkt-line unpack-sideband". * To remove newlines in sideband messages, we can use: $ test-tool pkt-line unpack-sideband --chomp-newline * To preserve newlines in sideband messages, we can use: $ test-tool pkt-line unpack-sideband --no-chomp-newline * To parse sideband messages using "demultiplex_sideband()" inside the function "packet_reader_read()", we can use: $ test-tool pkt-line unpack-sideband --reader-use-sideband We also add new example sideband packets in send_split_sideband() and add several new test cases in t0070. Among these test cases, we pipe output of the "send-split-sideband" subcommand to the "unpack-sideband" subcommand. We found two issues: 1. The two splitted sideband messages "Hello," and " world!\n" should be concatenated together. But when we turn on use_sideband field of reader to parse sideband messages, the first part of the splitted message ("Hello,") is lost. 2. The newline characters in sideband 2 (progress info) and sideband 3 (error message) should be preserved, but they are both trimmed. Will fix the above two issues in subsequent commits. Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 December 2023, 21:24:37 UTC
6d6f1cd Junio C Hamano 15 December 2023, 22:28:00 UTC doc: format.notes specify a ref under refs/notes/ hierarchy There is no 'ref/notes/' hierarchy. '[format] notes = foo' uses notes that are found in 'refs/notes/foo'. Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 December 2023, 19:30:46 UTC
37e8d79 Shreyansh Paliwal 03 December 2023, 17:17:59 UTC test-lib-functions.sh: fix test_grep fail message wording In the recent commit 2e87fca189 (test framework: further deprecate test_i18ngrep, 2023-10-31), the test_i18ngrep function was deprecated, and all the callers were updated to call the test_grep function instead. But test_grep inherited an error message that still refers to test_i18ngrep by mistake. Correct it so that a broken call to the test_grep will identify itself as such. Signed-off-by: Shreyansh Paliwal <shreyanshpaliwalcmsmn@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 December 2023, 18:44:41 UTC
18ce489 Jiang Xin 17 December 2023, 14:11:34 UTC fetch: no redundant error message for atomic fetch If an error occurs during an atomic fetch, a redundant error message will appear at the end of do_fetch(). It was introduced in b3a804663c (fetch: make `--atomic` flag cover backfilling of tags, 2022-02-17). Because a failure message is displayed before setting retcode in the function do_fetch(), calling error() on the err message at the end of this function may result in redundant or empty error message to be displayed. We can remove the redundant error() function, because we know that the function ref_transaction_abort() never fails. While we can find a common pattern for calling ref_transaction_abort() by running command "git grep -A1 ref_transaction_abort", e.g.: if (ref_transaction_abort(transaction, &error)) error("abort: %s", error.buf); Following this pattern, we can tolerate the return value of the function ref_transaction_abort() being changed in the future. We also delay the output of the err message to the end of do_fetch() to reduce redundant code. With these changes, the test case "fetch porcelain output (atomic)" in t5574 will also be fixed. Helped-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> Acked-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 December 2023, 16:30:33 UTC
97d82b2 Jiang Xin 17 December 2023, 14:11:33 UTC t5574: test porcelain output of atomic fetch The test case "fetch porcelain output" checks output of the fetch command. The error output must be empty with the follow assertion: test_must_be_empty stderr But this assertion fails if using atomic fetch. Refactor this test case to use different fetch options by splitting it into three test cases. 1. "setup for fetch porcelain output". 2. "fetch porcelain output": for non-atomic fetch. 3. "fetch porcelain output (atomic)": for atomic fetch. Add new command "test_commit ..." in the first test case, so that if we run these test cases individually (--run=4-6), "git rev-parse HEAD~" command will work properly. Run the above test cases, we can find that one test case has a known breakage, as shown below: ok 4 - setup for fetch porcelain output ok 5 - fetch porcelain output # TODO known breakage vanished not ok 6 - fetch porcelain output (atomic) # TODO known breakage The failed test case has an error message with only the error prompt but no message body, as follows: 'stderr' is not empty, it contains: error: In a later commit, we will fix this issue. Helped-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> Acked-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 December 2023, 16:30:32 UTC
bc62d27 Junio C Hamano 15 December 2023, 20:32:45 UTC docs: MERGE_AUTOSTASH is not that special A handful of manual pages called MERGE_AUTOSTASH a "special ref", but there is nothing special about it. It merely is yet another pseudoref. Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 December 2023, 22:08:28 UTC
dada386 Junio C Hamano 15 December 2023, 20:32:44 UTC docs: AUTO_MERGE is not that special A handful of manual pages called AUTO_MERGE a "special ref", but there is nothing special about it. It merely is yet another pseudoref. Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 December 2023, 22:08:28 UTC
7122f4f Junio C Hamano 15 December 2023, 20:32:43 UTC refs.h: HEAD is not that special In-code comment explains pseudorefs but used a wrong nomenclature "special ref". Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 December 2023, 22:08:28 UTC
2047b2c Junio C Hamano 15 December 2023, 20:32:42 UTC git-bisect.txt: BISECT_HEAD is not that special The description of "git bisect --no-checkout" called BISECT_HEAD a "special ref", but there is nothing special about it. It merely is yet another pseudoref. Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 December 2023, 22:08:28 UTC
back to top