git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* What's cooking in git.git (Oct 2022, #09; Mon, 31)
@ 2022-10-31  5:31 Taylor Blau
  2022-10-31 23:44 ` ab/cmake-nix-and-ci (was: What's cooking in git.git (Oct 2022, #09; Mon, 31)) Ævar Arnfjörð Bjarmason
                   ` (4 more replies)
  0 siblings, 5 replies; 14+ messages in thread
From: Taylor Blau @ 2022-10-31  5:31 UTC (permalink / raw)
  To: git

What's cooking in git.git (Oct 2022, #09; Mon, 31)
--------------------------------------------------

Here are the topics that have been cooking in my tree.  Commits
prefixed with '+' are in 'next' (being in 'next' is a sign that a
topic is stable enough to be used and are candidate to be in a future
release).  Commits prefixed with '-' are only in 'seen', and aren't
considered "accepted" at all.  A topic without enough support may be
discarded after a long period of no activity.

This is the first pushout from the interim maintainer. Topics which
were marked as ready for 'master' have been merged, and 'next' is now
empty. A number of topics have been marked for 'next' which will start
graduating in the next round.

Please point out any glitches you see along the way. If a topic you
sent doesn't appear here, please nudge me or resend it.

Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors.  Some
repositories have only a subset of branches.

With maint, master, next, seen, todo:

	https://github.com/git/git/

The following mirrors are currently out-of-date while the usual
maintainer is offline.

	git://git.kernel.org/pub/scm/git/git.git/
	git://repo.or.cz/alt-git.git/
	https://kernel.googlesource.com/pub/scm/git/git/
	https://gitlab.com/git-vcs/git/

With all the integration branches and topics broken out:

	https://github.com/ttaylorr/git/

Even though the preformatted documentation in HTML and man format
are not sources, they are typically published in these repositories
for convenience (replace "htmldocs" with "manpages" for the manual
  pages):

	git://git.kernel.org/pub/scm/git/git-htmldocs.git/
	https://github.com/gitster/git-htmldocs.git/

...but these and the release tarballs below are similarly out-of-date:

	https://www.kernel.org/pub/software/scm/git/

--------------------------------------------------
[Graduated to 'master']

* ds/bundle-uri-3 (2022-10-12) 13 commits
  (merged to 'next' on 2022-10-28 at 9d9092b4cc)
 + bundle-uri: suppress stderr from remote-https
 + bundle-uri: quiet failed unbundlings
 + bundle: add flags to verify_bundle()
 + bundle-uri: fetch a list of bundles
 + bundle: properly clear all revision flags
 + bundle-uri: limit recursion depth for bundle lists
 + bundle-uri: parse bundle list in config format
 + bundle-uri: unit test "key=value" parsing
 + bundle-uri: create "key=value" line parsing
 + bundle-uri: create base key-value pair parsing
 + bundle-uri: create bundle_list struct and helpers
 + bundle-uri: use plain string in find_temp_filename()
 + Merge branch 'ds/bundle-uri-clone' into ds/bundle-uri-3

 Define the logical elements of a "bundle list", data structure to
 store them in-core, format to transfer them, and code to parse
 them.
 source: <pull.1333.v5.git.1665579160.gitgitgadget@gmail.com>


* en/merge-tree-sequence (2022-10-22) 2 commits
  (merged to 'next' on 2022-10-28 at 31459cd5a8)
 + merge-tree: support multiple batched merges with --stdin
 + merge-tree: update documentation for differences in -z output

 "git merge-tree --stdin" is a new way to request a series of merges
 and report the merge results.
 source: <pull.1361.git.1666488485.gitgitgadget@gmail.com>


* en/ort-dir-rename-and-symlink-fix (2022-10-22) 1 commit
  (merged to 'next' on 2022-10-27 at 56f1e5222d)
 + merge-ort: fix bug with dir rename vs change dir to symlink

 Merging a branch with directory renames into a branch that changes
 the directory to a symlink was mishandled by the ort merge
 strategy, which has been corrected.
 source: <pull.1391.git.1666465450590.gitgitgadget@gmail.com>


* jc/doc-fsck-msgids (2022-10-25) 4 commits
  (merged to 'next' on 2022-10-28 at 3c00edabf8)
 + Documentation: add lint-fsck-msgids
 + fsck: document msg-id
 + fsck: remove the unused MISSING_TREE_OBJECT
 + fsck: remove the unused BAD_TAG_OBJECT

 Add documentation for message IDs in fsck error messages.
 source: <20221025224224.2352979-1-gitster@pobox.com>


* jh/trace2-timers-and-counters (2022-10-24) 8 commits
  (merged to 'next' on 2022-10-26 at e4933e2658)
 + trace2: add global counter mechanism
 + trace2: add stopwatch timers
 + trace2: convert ctx.thread_name from strbuf to pointer
 + trace2: improve thread-name documentation in the thread-context
 + trace2: rename the thread_name argument to trace2_thread_start
 + api-trace2.txt: elminate section describing the public trace2 API
 + tr2tls: clarify TLS terminology
 + trace2: use size_t alloc,nr_open_regions in tr2tls_thread_ctx

 Two new facilities, "timer" and "counter", are introduced to the
 trace2 API.
 source: <pull.1373.v4.git.1666618868.gitgitgadget@gmail.com>


* jk/repack-tempfile-cleanup (2022-10-23) 6 commits
  (merged to 'next' on 2022-10-26 at e706eb120c)
 + t7700: annotate cruft-pack failure with ok=sigpipe
 + repack: drop remove_temporary_files()
 + repack: use tempfiles for signal cleanup
 + repack: expand error message for missing pack files
 + repack: populate extension bits incrementally
 + repack: convert "names" util bitfield to array

 The way "git repack" creared temporary files when it received a
 signal was prone to deadlocking, which has been corrected.
 source: <Y1M3fVnixJHvKiSg@coredump.intra.peff.net>


* jr/embargoed-releases-doc (2022-10-24) 1 commit
  (merged to 'next' on 2022-10-27 at c000502eaa)
 + embargoed releases: also describe the git-security list and the process

 The role the security mailing list plays in an embargoed release
 has been documented.
 source: <pull.1345.v4.git.1666649239302.gitgitgadget@gmail.com>


* jt/skipping-negotiator-wo-recursion (2022-10-25) 1 commit
  (merged to 'next' on 2022-10-28 at 4a2588ab9e)
 + negotiator/skipping: avoid stack overflow

 Rewrite a deep recursion in the skipping negotiator to use a loop
 with on-heap prio queue to avoid stack wastage.
 source: <20221025232934.1504445-1-jonathantanmy@google.com>


* jz/patch-id (2022-10-24) 6 commits
  (merged to 'next' on 2022-10-24 at 1ac3b46fbe)
 + builtin: patch-id: remove unused diff-tree prefix
 + builtin: patch-id: add --verbatim as a command mode
 + patch-id: fix patch-id for mode changes
 + builtin: patch-id: fix patch-id with binary diffs
 + patch-id: use stable patch-id for rebases
 + patch-id: fix stable patch id for binary / header-only

 A new "--include-whitespace" option is added to "git patch-id", and
 existing bugs in the internal patch-id logic that did not match
 what "git patch-id" produces have been corrected.
 source: <pull.1359.v5.git.1666642064.gitgitgadget@gmail.com>


* pb/subtree-split-and-merge-after-squashing-tag-fix (2022-10-21) 9 commits
  (merged to 'next' on 2022-10-27 at 4f2134dd87)
 + subtree: fix split after annotated tag was squashed merged
 + subtree: fix squash merging after annotated tag was squashed merged
 + subtree: process 'git-subtree-split' trailer in separate function
 + subtree: use named variables instead of "$@" in cmd_pull
 + subtree: define a variable before its first use in 'find_latest_squash'
 + subtree: prefix die messages with 'fatal'
 + subtree: add 'die_incompatible_opt' function to reduce duplication
 + subtree: use 'git rev-parse --verify [--quiet]' for better error messages
 + test-lib-functions: mark 'test_commit' variables as 'local'

 A bugfix to "git subtree" in its split and merge features.
 source: <pull.1390.git.1666365219.gitgitgadget@gmail.com>


* pw/rebase-keep-base-fixes (2022-10-17) 8 commits
  (merged to 'next' on 2022-10-27 at 802359afac)
 + rebase --keep-base: imply --no-fork-point
 + rebase --keep-base: imply --reapply-cherry-picks
 + rebase: factor out branch_base calculation
 + rebase: rename merge_base to branch_base
 + rebase: store orig_head as a commit
 + rebase: be stricter when reading state files containing oids
 + t3416: set $EDITOR in subshell
 + t3416: tighten two tests
 (this branch is used by pw/rebase-reflog-fixes.)

 "git rebase --keep-base" used to discard the commits that are
 already cherry-picked to the upstream, even when "keep-base" meant
 that the base, on top of which the history is being rebuilt, does
 not yet include these cherry-picked commits.  The --keep-base
 option now implies --reapply-cherry-picks and --no-fork-point
 options.
 source: <pull.1323.v4.git.1666012665.gitgitgadget@gmail.com>


* pw/rebase-reflog-fixes (2022-10-17) 9 commits
  (merged to 'next' on 2022-10-27 at 60738821ef)
 + rebase: cleanup action handling
 + rebase --abort: improve reflog message
 + rebase --apply: make reflog messages match rebase --merge
 + rebase --apply: respect GIT_REFLOG_ACTION
 + rebase --merge: fix reflog message after skipping
 + rebase --merge: fix reflog when continuing
 + t3406: rework rebase reflog tests
 + rebase --apply: remove duplicated code
 + Merge branch 'pw/rebase-keep-base-fixes' into pw/rebase-reflog-fixes
 (this branch uses pw/rebase-keep-base-fixes.)

 Fix some bugs in the reflog messages when rebasing and changes the
 reflog messages of "rebase --apply" to match "rebase --merge" with
 the aim of making the reflog easier to parse.
 source: <pull.1150.v3.git.1665567312.gitgitgadget@gmail.com>


* rj/branch-copy-rename-error-codepath-cleanup (2022-10-26) 1 commit
  (merged to 'next' on 2022-10-27 at f01a4ff619)
 + branch: error copying or renaming a detached HEAD

 Code simplification.
 source: <0ac8cd48-08d7-9bdd-b074-c8d5ded522f6@gmail.com>


* rj/branch-do-not-exit-with-minus-one-status (2022-10-26) 1 commit
  (merged to 'next' on 2022-10-27 at 061f63d4e2)
 + branch: error code with --edit-description

 "git branch --edit-description" can exit with status -1 which is
 not a good practice; it learned to use 1 as everybody else instead.
 source: <b0f96b35-4e69-a889-bcdf-e0b40b89384f@gmail.com>


* rs/absorb-git-dir-simplify (2022-10-23) 1 commit
  (merged to 'next' on 2022-10-26 at 3d23cfd399)
 + submodule: use strvec_pushf() for --super-prefix

 Code simplification by using strvec_pushf() instead of building an
 argument in a separate strbuf.
 source: <7a4e2fc6-3e01-5683-2be5-13b7e67c7fe5@web.de>


* sd/doc-smtp-encryption (2022-10-12) 1 commit
  (merged to 'next' on 2022-10-26 at b984763a1b)
 + docs: git-send-email: difference between ssl and tls smtp-encryption

 Will merge to 'master'.
 source: <20221012150619.12877-1-sndanailov@wired4ever.net>


* sg/stable-docdep (2022-10-21) 1 commit
  (merged to 'next' on 2022-10-26 at 68432e1b2c)
 + Documentation/build-docdep.perl: generate sorted output

 Make sure generated dependency file is stably sorted to help
 developers debugging their build issues.
 source: <20221021102950.539148-1-szeder.dev@gmail.com>


* tb/cap-patch-at-1gb (2022-10-25) 1 commit
  (merged to 'next' on 2022-10-27 at f0b4f9c12a)
 + apply: reject patches larger than ~1 GiB

 "git apply" limits its input to a bit less than 1 GiB.
 source: <70f5763834dff373a5573a99ec4cdfa36cadf34c.1666722251.git.me@ttaylorr.com>


* tb/midx-cleanup-fix (2022-10-25) 1 commit
 - midx.c: clear auxiliary MIDX files first

 The order in which multi-pack-index and its associated files are
 dropped has been tweaked to make it safer for concurrent users.

 Under discussion, but leaning to negative..
 cf. <143a588a-c98b-733b-2b23-34a87ca89431@github.com>
 source: <bf36093cd6d7ac83b16241b0199b3a8c904e6774.1666722316.git.me@ttaylorr.com>


* tb/shortlog-group (2022-10-24) 7 commits
  (merged to 'next' on 2022-10-26 at 76e64a6036)
 + shortlog: implement `--group=committer` in terms of `--group=<format>`
 + shortlog: implement `--group=author` in terms of `--group=<format>`
 + shortlog: extract `shortlog_finish_setup()`
 + shortlog: support arbitrary commit format `--group`s
 + shortlog: extract `--group` fragment for translation
 + shortlog: make trailer insertion a noop when appropriate
 + shortlog: accept `--date`-related options

 "git shortlog" learned to group by the "format" string.
 source: <cover.1666637725.git.me@ttaylorr.com>

--------------------------------------------------
[New Topics]

* ab/cmake-nix-and-ci (2022-10-30) 11 commits
 - CI: add a "linux-cmake-test" to run cmake & ctest on linux
 - cmake: copy over git-p4.py for t983[56] perforce test
 - cmake: support GIT_TEST_OPTS, abstract away WIN32 defaults
 - Makefile + cmake: use environment, not GIT-BUILD-DIR
 - test-lib.sh: support a "GIT_TEST_BUILD_DIR"
 - cmake: set "USE_LIBPCRE2" in "GIT-BUILD-OPTIONS" for test-lib.sh
 - cmake & test-lib.sh: add a $GIT_SOURCE_DIR variable
 - cmake: chmod +x the bin-wrappers/* & SCRIPT_{SH,PERL} & git-p4
 - cmake: don't copy chainlint.pl to build directory
 - cmake: update instructions for portable CMakeLists.txt
 - cmake: don't "mkdir -p" and "cd" in build instructions

 Fix assorted issues with CTest on *nix machines.

 Waiting for review.
 source: <cover-v2-00.11-00000000000-20221027T032622Z-avarab@gmail.com>


* ab/make-bin-wrappers (2022-10-30) 3 commits
 - Makefile: simplify $(test_bindir_programs) rule by splitting it up
 - Makefile: define "TEST_{PROGRAM,OBJS}" variables earlier
 - Makefile: factor sed-powered '#!/bin/sh' munging into a variable

 Resolve issues with the bin-wrappers/% rules where "make
 bin-wrappers/git" would generate the script but not "git" itself.

 Waiting for review.
 source: <cover-v2-0.3-00000000000-20221026T143533Z-avarab@gmail.com>


* ab/misc-hook-submodule-run-command (2022-10-31) 3 commits
 - run-command tests: test stdout of run_command_parallel()
 - submodule tests: reset "trace.out" between "grep" invocations
 - hook tests: fix redirection logic error in 96e7225b310

 Various test updates.

 Waiting for review.
 source: <cover-0.3-00000000000-20221029T025520Z-avarab@gmail.com>


* do/modernize-t7001 (2022-10-31) 1 commit
 - t7001-mv.sh:modernizing test script using function

 Modernize test script to avoid "test -f" and friends.

 Will merge to 'next'.
 source: <pull.1372.git.git.1667150441883.gitgitgadget@gmail.com>


* kz/merge-tree-merge-base (2022-10-29) 1 commit
 - merge-tree.c: add --merge-base=<commit> option

 "merge-tree" learns a new `--merge-base` option.

 Waiting for review.
 source: <pull.1397.v3.git.1667014975042.gitgitgadget@gmail.com>


* mh/password-can-be-pat (2022-10-30) 1 commit
 - Mention that password could be a personal access token.

 Documentation update to git-credential(1).

 Will merge to 'next'.
 source: <pull.1396.git.1666845947898.gitgitgadget@gmail.com>


* po/pretty-hard-trunc (2022-10-30) 1 commit
 - pretty-formats: add hard truncation, without ellipsis, options

 Add a new pretty format which truncates without ellipsis.

 Missing test coverage.
 source: <20221030185614.3842-1-philipoakley@iee.email>


* rr/long-status-advice (2022-10-31) 1 commit
 - status: long status advice adapted to recent capabilities

 The advice message emitted by a slow "status" run is amended to
 mention fsmonitor.

 Waiting for reviewer feedback on the updated round.
 source: <pull.1384.v2.git.1667002005494.gitgitgadget@gmail.com>


* rs/archive-filter-error-once (2022-10-30) 1 commit
 - archive-tar: report filter start error only once

 "git archive" mistakenly complained twice about a missing executable,
 which has been corrected.

 Will merge to 'next'.
 source: <c51b72e5-1c32-65e4-6faa-04693b623e2e@web.de>

--------------------------------------------------
[Stalled]

* cw/submodule-status-in-parallel (2022-10-20) 7 commits
 . diff-lib: parallelize run_diff_files for submodules
 . diff-lib: refactor match_stat_with_submodule
 . submodule: move status parsing into function
 . submodule: strbuf variable rename
 . run-command: add hide_output to run_processes_parallel_opts
 . run-command: add pipe_output_fn to run_processes_parallel_opts
 . Merge branch 'ab/run-hook-api-cleanup' into cw/submodule-status-in-parallel

 Allow the internal "diff-files" engine to run "how has this
 submodule changed?" in parallel to speed up "git status".

 Breaks winVS test?
 cf. <https://github.com/git/git/actions/runs/3298596454/jobs/5441029092>
 source: <20221011232604.839941-1-calvinwan@google.com>


* js/bisect-in-c (2022-08-30) 17 commits
 . bisect: no longer try to clean up left-over `.git/head-name` files
 . bisect: remove Cogito-related code
 . Turn `git bisect` into a full built-in
 . bisect: move even the command-line parsing to `bisect--helper`
 . bisect--helper: make `state` optional
 . bisect--helper: calling `bisect_state()` without an argument is a bug
 . bisect: avoid double-quoting when printing the failed command
 . bisect run: fix the error message
 . bisect: verify that a bogus option won't try to start a bisection
 . bisect--helper: migrate to OPT_SUBCOMMAND()
 . bisect--helper: make the order consistently `argc, argv`
 . bisect--helper: make `terms` an explicit singleton
 . bisect--helper: simplify exit code computation
 . bisect--helper: really retire `--bisect-autostart`
 . bisect--helper: really retire --bisect-next-check
 . bisect--helper: retire the --no-log option
 . Merge branch 'sg/parse-options-subcommand' into js/bisect-in-c

 Final bits of "git bisect.sh" have been rewritten in C.

 Needs review.
 cf. <xmqqv8pr8903.fsf@gitster.g>
 source: <pull.1132.v6.git.1661885419.gitgitgadget@gmail.com>


* od/ci-use-checkout-v3-when-applicable (2022-10-10) 2 commits
 . ci(main): linux32 uses actions/checkout@v2
 . ci(main): upgrade actions/checkout to v3

 Attempt to update GitHub CI to use actions/checkout@v3

 Expecting a reroll.
 Seems to break the CI completely.
 source: <pull.1354.git.git.1665388136.gitgitgadget@gmail.com>


* ed/fsmonitor-inotify (2022-10-14) 7 commits
 . fsmonitor: update doc for Linux
 . fsmonitor: test updates
 . fsmonitor: enable fsmonitor for Linux
 . fsmonitor: implement filesystem change listener for Linux
 . fsmonitor: determine if filesystem is local or remote
 . fsmonitor: prepare to share code between Mac OS and Linux
 . Merge branch 'ed/fsmonitor-on-networked-macos' into ed/fsmonitor-inotify

 Bundled fsmonitor for Linux using inotify API.

 Needs review.
 Occasional breakages of t7527.16?
 source: <pull.1352.v2.git.git.1665783944.gitgitgadget@gmail.com>


* ag/merge-strategies-in-c (2022-08-10) 14 commits
 . sequencer: use the "octopus" strategy without forking
 . sequencer: use the "resolve" strategy without forking
 . merge: use the "octopus" strategy without forking
 . merge: use the "resolve" strategy without forking
 . merge-octopus: rewrite in C
 . merge-recursive: move better_branch_name() to merge.c
 . merge-resolve: rewrite in C
 . merge-one-file: rewrite in C
 . update-index: move add_cacheinfo() to read-cache.c
 . merge-index: add a new way to invoke `git-merge-one-file'
 . merge-index: drop the index
 . merge-index: libify merge_one_path() and merge_all()
 . t6060: add tests for removed files
 . t6060: modify multiple files to expose a possible issue with merge-index

 An attempt to rewrite remaining merge strategies from shell to C.

 Needs more work.
 At the minimum, we should lose 11/14 and possibly 08/14.
 cf. <xmqq7d36vfur.fsf@gitster.g>
 source: <20220809185429.20098-1-alban.gruin@gmail.com>


* es/doc-creation-factor-fix (2022-07-28) 2 commits
 . range-diff: clarify --creation-factor=<factor>
 . format-patch: clarify --creation-factor=<factor>

 Expecting a reroll by somebody more familiar with the logic
 cf. <xmqqo7wfix7p.fsf@gitster.g>
 source: <7229p500-p2r4-on87-6802-8o90s36rr3s4@tzk.qr>


* cw/remote-object-info (2022-08-13) 7 commits
 . SQUASH???
 . cat-file: add remote-object-info to batch-command
 . transport: add client support for object-info
 . serve: advertise object-info feature
 . protocol-caps: initialization bug fix
 . fetch-pack: move fetch initialization
 . fetch-pack: refactor packet writing

 A client component to talk with the object-info endpoint.

 Expecting a reroll.
 Under SANITIZE=address, t1006-cat-file.sh finds a breakage.
 cf. <20220728230210.2952731-1-calvinwan@google.com>
 cf. <CAFySSZDvgwbbHCHfyuaqX3tKsr-GjJ9iihygg6rNNe46Ys7_EA@mail.gmail.com>
 source: <20220728230210.2952731-1-calvinwan@google.com>

--------------------------------------------------
[Cooking]

* ab/config-multi-and-nonbool (2022-10-27) 10 commits
 - for-each-repo: with bad config, don't conflate <path> and <cmd>
 - config API: add "string" version of *_value_multi(), fix segfaults
 - config tests: add "NULL" tests for *_get_value_multi()
 - config API: add and use "lookup_value" functions
 - builtin/gc.c: use "unsorted_string_list_has_string()" where appropriate
 - string-list API: make has_string() and list_lookup() "const"
 - string-list API: mark "struct_string_list" to "for_each_string_list" const
 - config API: mark *_multi() with RESULT_MUST_BE_USED
 - for-each-repo: error on bad --config
 - config API: have *_multi() return an "int" and take a "dest"

 A mixed bag of config API updates.

 Expecting a reroll.
 cf. <221026.86pmeebcj9.gmgdl@evledraar.gmail.com>
 source: <cover-00.10-00000000000-20221026T151328Z-avarab@gmail.com>


* ab/sha-makefile-doc (2022-10-26) 9 commits
 - Makefile: discuss SHAttered in *_SHA{1,256} discussion
 - Makefile: document default SHA-1 backend on OSX
 - Makefile: document SHA-1 and SHA-256 default and selection order
 - Makefile: document default SHA-256 backend
 - Makefile: rephrase the discussion of *_SHA1 knobs
 - Makefile: create and use sections for "define" flag listing
 - Makefile: correct DC_SHA1 documentation
 - INSTALL: remove discussion of SHA-1 backends
 - Makefile: always (re)set DC_SHA1 on fallback

 Makefile comments updates and reordering to clarify knobs used to
 choose SHA implementations.

 Will merge to 'next'?
 source: <cover-v4-0.9-00000000000-20221026T145255Z-avarab@gmail.com>


* rs/no-more-run-command-v (2022-10-30) 12 commits
 - replace and remove run_command_v_opt()
 - replace and remove run_command_v_opt_cd_env_tr2()
 - replace and remove run_command_v_opt_tr2()
 - replace and remove run_command_v_opt_cd_env()
 - use child_process members "args" and "env" directly
 - use child_process member "args" instead of string array variable
 - sequencer: simplify building argument list in do_exec()
 - bisect--helper: factor out do_bisect_run()
 - bisect: simplify building "checkout" argument list
 - am: simplify building "show" argument list
 - run-command: fix return value comment
 - merge: remove always-the-same "verbose" arguments

 Simplify the run-command API.

 Will merge to 'next'.
 source: <ea061164-b36b-485c-963f-8c13e813a47e@web.de>


* tb/howto-using-redo-script (2022-10-26) 1 commit
 - Documentation/howto/maintain-git.txt: fix Meta/redo-jch.sh invocation

 Doc update.

 Will merge to 'next'.
 source: <4ba057094ae6b1bd5c18583f23f7f99232034c72.1666815325.git.me@ttaylorr.com>


* ps/receive-use-only-advertised (2022-10-28) 3 commits
 - SQUASH - leakfix
 - receive-pack: use advertised reference tips to inform connectivity check
 - connected: allow supplying different view of reachable objects

 "git receive-pack" used to use all the local refs as the boundary
 for checking connectivity of the data "git push" sent, but now it
 uses only the refs that it advertised to the pusher.  In a
 repository with the .hideRefs configuration, this reduces the
 resource needed to perform the check, and also forces the pusher to
 prove they have all objects that are necessary to complete the
 history on top of only the history available to them.

 Expecting a reroll.
 cf. <221028.86bkpw805n.gmgdl@evledraar.gmail.com>
 cf. <xmqqr0yrizqm.fsf@gitster.g>
 source: <cover.1666967670.git.ps@pks.im>


* jc/set-gid-bit-less-aggressively (2022-10-28) 1 commit
 - adjust_shared_perm(): leave g+s alone when the group does not matter

 The adjust_shared_perm() helper function learned to refrain from
 setting the "g+s" bit on directories when it is not necessary.

 Will merge to 'next'.
 source: <xmqqr0yrhco6.fsf@gitster.g>


* gc/submodule-clone-update-with-branches (2022-10-30) 8 commits
 - clone, submodule update: create and check out branches
 - submodule--helper: remove update_data.suboid
 - submodule update: refactor update targets
 - submodule: return target of submodule symref
 - t5617: drop references to remote-tracking branches
 - submodule--helper clone: create named branch
 - repo-settings: add submodule_propagate_branches
 - clone: teach --detach option

 "git clone --recurse-submodules" and "git submodule update" learns
 to honor the "propagete branches" option.

 Waiting for review.
 source: <pull.1321.v3.git.git.1666988096.gitgitgadget@gmail.com>


* es/mark-gc-cruft-as-experimental (2022-10-26) 2 commits
 - config: let feature.experimental imply gc.cruftPacks=true
 - gc: add tests for --cruft and friends

 Enable gc.cruftpacks by default for those who opt into
 feature.experimental setting.

 Will merge to 'next'.
 source: <cover.1666819953.git.me@ttaylorr.com>


* pw/config-int-parse-fixes (2022-10-22) 3 commits
 - git_parse_signed(): avoid integer overflow
 - config: require at least one digit when parsing numbers
 - git_parse_unsigned: reject negative values

 Assorted fixes of parsing end-user input as integers.

 Expecting a reroll to add test coverage.
 cf. <Y1L+Qv+cs1bjqjK9@coredump.intra.peff.net>
 source: <pull.1389.git.1666359915.gitgitgadget@gmail.com>


* sa/cat-file-mailmap (2022-10-21) 1 commit
 - doc/cat-file: allow --use-mailmap for --batch options

 Doc updates.

 Waiting for review response.
 source: <20221021103442.202759-1-siddharthasthana31@gmail.com>


* tb/repack-expire-to (2022-10-24) 4 commits
 - builtin/repack.c: implement `--expire-to` for storing pruned objects
 - builtin/repack.c: write cruft packs to arbitrary locations
 - builtin/repack.c: pass "cruft_expiration" to `write_cruft_pack`
 - builtin/repack.c: pass "out" to `prepare_pack_objects`

 "git repack" learns to send cruft objects out of the way into
 packfiles outside the repository.

 Waiting for review.
 source: <cover.1666636974.git.me@ttaylorr.com>


* cc/filtered-repack (2022-10-25) 2 commits
 - repack: add --filter=<filter-spec> option
 - pack-objects: allow --filter without --stdout

 "git repack" learns to discard objects that ought to be retrievable
 again from the promissor remote.

 Needs review.
 source: <20221025122856.20204-1-christian.couder@gmail.com>


* al/trace2-clearing-skip-worktree (2022-10-28) 2 commits
 - SQUASH???
 - index: add trace2 region for clear skip worktree

 Add trace2 counters to the region to clear skip worktree bits in a
 sparse checkout.

 Expecting a reroll?
 source: <pull.1368.v2.git.git.1666917961644.gitgitgadget@gmail.com>


* po/glossary-around-traversal (2022-10-30) 4 commits
 - glossary: add reachability bitmap description
 - glossary: add "commit graph" description
 - doc: use 'object database' not ODB or abbreviation
 - doc: use "commit-graph" hyphenation consistently

 The glossary entries for "commit-graph file" and "reachability
 bitmap" have been added.

 Will merge to 'next'.
 source: <20221029164112.2097-1-philipoakley@iee.email>


* mc/credential-helper-auth-headers (2022-10-21) 6 commits
 - t5556-http-auth: add test for HTTP auth hdr logic
 - http: set specific auth scheme depending on credential
 - http: move proactive auth to first slot creation
 - http: store all request headers on active_request_slot
 - credential: add WWW-Authenticate header to cred requests
 - http: read HTTP WWW-Authenticate response headers

 Extending credential helper protocol.

 Needs review.
 source: <pull.1352.v2.git.1666372083.gitgitgadget@gmail.com>


* hl/archive-recursive (2022-10-19) 10 commits
 - fixup! archive: add tests for git archive --recurse-submodules
 - archive: add tests for git archive --recurse-submodules
 - archive: add --recurse-submodules to git-archive command
 - archive: remove global repository from archive_args
 - archive: pass repo objects to write_archive handlers
 - tree: add repository parameter to read_tree_fn_t
 - tree: handle submodule case for read_tree_at properly
 - tree: increase test coverage for tree.c
 - tree: update cases to use repo_ tree methods
 - tree: do not use the_repository for tree traversal methods.

 "git archive" has been taught "--recurse-submodules" option to
 create a tarball that includes contents from submodules.

 Expecting a reroll.
 Seems to break win+VS test(8).
 cf. https://github.com/git/git/actions/runs/3293333066 whose only
 difference from https://github.com/git/git/actions/runs/3293553109
 is the inclusion of this topic.
 source: <pull.1359.v3.git.git.1665973401.gitgitgadget@gmail.com>


* en/sparse-checkout-design (2022-10-08) 1 commit
 - sparse-checkout.txt: new document with sparse-checkout directions

 Design doc.

 Needs review.
 source: <pull.1367.v3.git.1665269538608.gitgitgadget@gmail.com>


* pw/test-todo (2022-10-06) 3 commits
 - test_todo: allow [verbose] test as the command
 - test_todo: allow [!] grep as the command
 - tests: add test_todo() to mark known breakages

 RFC for test framework improvement.

 Needs review.
 source: <pull.1374.git.1665068476.gitgitgadget@gmail.com>


* ab/coccicheck-incremental (2022-10-26) 12 commits
 - spatchcache: add a ccache-alike for "spatch"
 - cocci: run against a generated ALL.cocci
 - cocci rules: remove <id>'s from rules that don't need them
 - cocci: optimistically use COMPUTE_HEADER_DEPENDENCIES
 - cocci: make "coccicheck" rule incremental
 - cocci: split off "--all-includes" from SPATCH_FLAGS
 - cocci: split off include-less "tests" from SPATCH_FLAGS
 - Makefile: split off SPATCH_BATCH_SIZE comment from "cocci" heading
 - Makefile: have "coccicheck" re-run if flags change
 - Makefile: add ability to TAB-complete cocci *.patch rules
 - cocci rules: remove unused "F" metavariable from pending rule
 - Makefile + shared.mak: rename and indent $(QUIET_SPATCH_T)

 "make coccicheck" is time consuming. It has been made to run more
 incrementally.

 Will merge to 'next'?
 source: <cover-v4-00.12-00000000000-20221026T141005Z-avarab@gmail.com>

^ permalink raw reply	[flat|nested] 14+ messages in thread

* ab/cmake-nix-and-ci (was: What's cooking in git.git (Oct 2022, #09; Mon, 31))
  2022-10-31  5:31 What's cooking in git.git (Oct 2022, #09; Mon, 31) Taylor Blau
@ 2022-10-31 23:44 ` Ævar Arnfjörð Bjarmason
  2022-10-31 23:45 ` ab/make-bin-wrappers " Ævar Arnfjörð Bjarmason
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 14+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2022-10-31 23:44 UTC (permalink / raw)
  To: Taylor Blau; +Cc: git


On Mon, Oct 31 2022, Taylor Blau wrote:

> * ab/cmake-nix-and-ci (2022-10-30) 11 commits
>  - CI: add a "linux-cmake-test" to run cmake & ctest on linux
>  - cmake: copy over git-p4.py for t983[56] perforce test
>  - cmake: support GIT_TEST_OPTS, abstract away WIN32 defaults
>  - Makefile + cmake: use environment, not GIT-BUILD-DIR
>  - test-lib.sh: support a "GIT_TEST_BUILD_DIR"
>  - cmake: set "USE_LIBPCRE2" in "GIT-BUILD-OPTIONS" for test-lib.sh
>  - cmake & test-lib.sh: add a $GIT_SOURCE_DIR variable
>  - cmake: chmod +x the bin-wrappers/* & SCRIPT_{SH,PERL} & git-p4
>  - cmake: don't copy chainlint.pl to build directory
>  - cmake: update instructions for portable CMakeLists.txt
>  - cmake: don't "mkdir -p" and "cd" in build instructions
>
>  Fix assorted issues with CTest on *nix machines.
>
>  Waiting for review.
>  source: <cover-v2-00.11-00000000000-20221027T032622Z-avarab@gmail.com>

I'll send a v3 of this (currently waiting on CI to finish).

^ permalink raw reply	[flat|nested] 14+ messages in thread

* ab/make-bin-wrappers (was: What's cooking in git.git (Oct 2022, #09; Mon, 31))
  2022-10-31  5:31 What's cooking in git.git (Oct 2022, #09; Mon, 31) Taylor Blau
  2022-10-31 23:44 ` ab/cmake-nix-and-ci (was: What's cooking in git.git (Oct 2022, #09; Mon, 31)) Ævar Arnfjörð Bjarmason
@ 2022-10-31 23:45 ` Ævar Arnfjörð Bjarmason
  2022-10-31 23:46 ` ab/misc-hook-submodule-run-command " Ævar Arnfjörð Bjarmason
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 14+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2022-10-31 23:45 UTC (permalink / raw)
  To: Taylor Blau; +Cc: git


On Mon, Oct 31 2022, Taylor Blau wrote:

> * ab/make-bin-wrappers (2022-10-30) 3 commits
>  - Makefile: simplify $(test_bindir_programs) rule by splitting it up
>  - Makefile: define "TEST_{PROGRAM,OBJS}" variables earlier
>  - Makefile: factor sed-powered '#!/bin/sh' munging into a variable
>
>  Resolve issues with the bin-wrappers/% rules where "make
>  bin-wrappers/git" would generate the script but not "git" itself.
>
>  Waiting for review.
>  source: <cover-v2-0.3-00000000000-20221026T143533Z-avarab@gmail.com>

I've since sent a v3, hopefully addressing outstanding feedback:
https://lore.kernel.org/git/cover-v3-0.4-00000000000-20221031T222249Z-avarab@gmail.com/

^ permalink raw reply	[flat|nested] 14+ messages in thread

* ab/misc-hook-submodule-run-command (was: What's cooking in git.git (Oct 2022, #09; Mon, 31))
  2022-10-31  5:31 What's cooking in git.git (Oct 2022, #09; Mon, 31) Taylor Blau
  2022-10-31 23:44 ` ab/cmake-nix-and-ci (was: What's cooking in git.git (Oct 2022, #09; Mon, 31)) Ævar Arnfjörð Bjarmason
  2022-10-31 23:45 ` ab/make-bin-wrappers " Ævar Arnfjörð Bjarmason
@ 2022-10-31 23:46 ` Ævar Arnfjörð Bjarmason
  2022-11-01  0:15   ` Taylor Blau
  2022-11-02 16:49 ` What's cooking in git.git (Oct 2022, #09; Mon, 31) Ramsay Jones
  2022-11-02 17:22 ` js/bisect-in-c (was: What's cooking in git.git (Oct 2022, #09; Mon, 31)) Ævar Arnfjörð Bjarmason
  4 siblings, 1 reply; 14+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2022-10-31 23:46 UTC (permalink / raw)
  To: Taylor Blau; +Cc: git


On Mon, Oct 31 2022, Taylor Blau wrote:

> * ab/misc-hook-submodule-run-command (2022-10-31) 3 commits
>  - run-command tests: test stdout of run_command_parallel()
>  - submodule tests: reset "trace.out" between "grep" invocations
>  - hook tests: fix redirection logic error in 96e7225b310
>
>  Various test updates.
>
>  Waiting for review.
>  source: <cover-0.3-00000000000-20221029T025520Z-avarab@gmail.com>

I think per
https://lore.kernel.org/git/221031.86tu3k6u2d.gmgdl@evledraar.gmail.com/
&
https://lore.kernel.org/git/221031.86pme86tcg.gmgdl@evledraar.gmail.com/
that this is ready to advance.

If you don't agree about the 2/3 let's just drop that one. I don't
really care enough to start some alternate rewrite proposals for that
random test which I didn't add in the first place, so I don't really
have the motivation to fix it. It just seemed like an easy enough
post-cleanup for an earlier landed topic.

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: ab/misc-hook-submodule-run-command (was: What's cooking in git.git (Oct 2022, #09; Mon, 31))
  2022-10-31 23:46 ` ab/misc-hook-submodule-run-command " Ævar Arnfjörð Bjarmason
@ 2022-11-01  0:15   ` Taylor Blau
  2022-11-02 17:13     ` Ævar Arnfjörð Bjarmason
  0 siblings, 1 reply; 14+ messages in thread
From: Taylor Blau @ 2022-11-01  0:15 UTC (permalink / raw)
  To: Ævar Arnfjörð Bjarmason; +Cc: Taylor Blau, git

On Tue, Nov 01, 2022 at 12:46:57AM +0100, Ævar Arnfjörð Bjarmason wrote:
>
> On Mon, Oct 31 2022, Taylor Blau wrote:
>
> > * ab/misc-hook-submodule-run-command (2022-10-31) 3 commits
> >  - run-command tests: test stdout of run_command_parallel()
> >  - submodule tests: reset "trace.out" between "grep" invocations
> >  - hook tests: fix redirection logic error in 96e7225b310
> >
> >  Various test updates.
> >
> >  Waiting for review.
> >  source: <cover-0.3-00000000000-20221029T025520Z-avarab@gmail.com>
>
> I think per
> https://lore.kernel.org/git/221031.86tu3k6u2d.gmgdl@evledraar.gmail.com/
> &
> https://lore.kernel.org/git/221031.86pme86tcg.gmgdl@evledraar.gmail.com/
> that this is ready to advance.

Yeah, I agree. I was mistaken that GIT_TRACE truncated its output when
redirected to a file, but it appends. So, the series looks fine to me.

I would still like to hear from Emily, but otherwise I don't have a
problem starting to merge this down.

Thanks,
Taylor

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: What's cooking in git.git (Oct 2022, #09; Mon, 31)
  2022-10-31  5:31 What's cooking in git.git (Oct 2022, #09; Mon, 31) Taylor Blau
                   ` (2 preceding siblings ...)
  2022-10-31 23:46 ` ab/misc-hook-submodule-run-command " Ævar Arnfjörð Bjarmason
@ 2022-11-02 16:49 ` Ramsay Jones
  2022-11-02 17:22 ` js/bisect-in-c (was: What's cooking in git.git (Oct 2022, #09; Mon, 31)) Ævar Arnfjörð Bjarmason
  4 siblings, 0 replies; 14+ messages in thread
From: Ramsay Jones @ 2022-11-02 16:49 UTC (permalink / raw)
  To: Taylor Blau, git



On 31/10/2022 05:31, Taylor Blau wrote:
> What's cooking in git.git (Oct 2022, #09; Mon, 31)
> --------------------------------------------------
[snip]
> 
> The following mirrors are currently out-of-date while the usual
> maintainer is offline.
> 
> 	git://git.kernel.org/pub/scm/git/git.git/
> 	git://repo.or.cz/alt-git.git/
> 	https://kernel.googlesource.com/pub/scm/git/git/
> 	https://gitlab.com/git-vcs/git/
> 

Ah, I wondered why it had gone quiet ... :)

On Linux (same on 32-bit Linux and cygwin):

    $ git config remote.origin.url
    git://git.kernel.org/pub/scm/git/git.git
    $ 

[yes, an old curmudgeon!]

Well, I guess I should just enjoy the silence until
Junio returns. :D

ATB,
Ramsay Jones





^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: ab/misc-hook-submodule-run-command (was: What's cooking in git.git (Oct 2022, #09; Mon, 31))
  2022-11-01  0:15   ` Taylor Blau
@ 2022-11-02 17:13     ` Ævar Arnfjörð Bjarmason
  2022-11-02 17:24       ` Taylor Blau
  0 siblings, 1 reply; 14+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2022-11-02 17:13 UTC (permalink / raw)
  To: Taylor Blau; +Cc: git


On Mon, Oct 31 2022, Taylor Blau wrote:

> On Tue, Nov 01, 2022 at 12:46:57AM +0100, Ævar Arnfjörð Bjarmason wrote:
>>
>> On Mon, Oct 31 2022, Taylor Blau wrote:
>>
>> > * ab/misc-hook-submodule-run-command (2022-10-31) 3 commits
>> >  - run-command tests: test stdout of run_command_parallel()
>> >  - submodule tests: reset "trace.out" between "grep" invocations
>> >  - hook tests: fix redirection logic error in 96e7225b310
>> >
>> >  Various test updates.
>> >
>> >  Waiting for review.
>> >  source: <cover-0.3-00000000000-20221029T025520Z-avarab@gmail.com>
>>
>> I think per
>> https://lore.kernel.org/git/221031.86tu3k6u2d.gmgdl@evledraar.gmail.com/
>> &
>> https://lore.kernel.org/git/221031.86pme86tcg.gmgdl@evledraar.gmail.com/
>> that this is ready to advance.
>
> Yeah, I agree. I was mistaken that GIT_TRACE truncated its output when
> redirected to a file, but it appends. So, the series looks fine to me.
>
> I would still like to hear from Emily, but otherwise I don't have a
> problem starting to merge this down.

(Just looking at what I can & can't unblock)

In case that's a "let's hear from the author" (understandable) then this
is entirely my work, even if it's her in the "author" header.

Her last version of tha commit was[1], but this entire test is from
my[2] re-roll of that topic[3].

1. https://lore.kernel.org/git/20210527000856.695702-8-emilyshaffer@google.com/
2. https://lore.kernel.org/git/patch-03.31-1ad4e69f7da-20210528T110515Z-avarab@gmail.com/
3. https://lore.kernel.org/git/cover-00.31-00000000000-20210528T110515Z-avarab@gmail.com/

^ permalink raw reply	[flat|nested] 14+ messages in thread

* js/bisect-in-c (was: What's cooking in git.git (Oct 2022, #09; Mon, 31))
  2022-10-31  5:31 What's cooking in git.git (Oct 2022, #09; Mon, 31) Taylor Blau
                   ` (3 preceding siblings ...)
  2022-11-02 16:49 ` What's cooking in git.git (Oct 2022, #09; Mon, 31) Ramsay Jones
@ 2022-11-02 17:22 ` Ævar Arnfjörð Bjarmason
  2022-11-02 17:26   ` Taylor Blau
  2022-11-10 13:32   ` Johannes Schindelin
  4 siblings, 2 replies; 14+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2022-11-02 17:22 UTC (permalink / raw)
  To: Taylor Blau; +Cc: git, Johannes Schindelin


On Mon, Oct 31 2022, Taylor Blau wrote:

> What's cooking in git.git (Oct 2022, #09; Mon, 31)
> --------------------------------------------------
>
> * js/bisect-in-c (2022-08-30) 17 commits
>  . bisect: no longer try to clean up left-over `.git/head-name` files
>  . bisect: remove Cogito-related code
>  . Turn `git bisect` into a full built-in
>  . bisect: move even the command-line parsing to `bisect--helper`
>  . bisect--helper: make `state` optional
>  . bisect--helper: calling `bisect_state()` without an argument is a bug
>  . bisect: avoid double-quoting when printing the failed command
>  . bisect run: fix the error message
>  . bisect: verify that a bogus option won't try to start a bisection
>  . bisect--helper: migrate to OPT_SUBCOMMAND()
>  . bisect--helper: make the order consistently `argc, argv`
>  . bisect--helper: make `terms` an explicit singleton
>  . bisect--helper: simplify exit code computation
>  . bisect--helper: really retire `--bisect-autostart`
>  . bisect--helper: really retire --bisect-next-check
>  . bisect--helper: retire the --no-log option
>  . Merge branch 'sg/parse-options-subcommand' into js/bisect-in-c
>
>  Final bits of "git bisect.sh" have been rewritten in C.
>
>  Needs review.
>  cf. <xmqqv8pr8903.fsf@gitster.g>
>  source: <pull.1132.v6.git.1661885419.gitgitgadget@gmail.com>

I see this has been ejected out of "seen", presumably due to the
outstanding conflicts.

To the extent that Johannes doesn't have time I'd by happy to re-roll
this & look at it/fix whatever outstanding issues I spot.

I gave it a once over a few weeks ago, and didn't see any outstanding
problems with it worth rewriting in that iteration, but didn't have time
to give it stress testing to see if there were still some lurking
unexpected/untested behavior changes.

Johannes?

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: ab/misc-hook-submodule-run-command (was: What's cooking in git.git (Oct 2022, #09; Mon, 31))
  2022-11-02 17:13     ` Ævar Arnfjörð Bjarmason
@ 2022-11-02 17:24       ` Taylor Blau
  0 siblings, 0 replies; 14+ messages in thread
From: Taylor Blau @ 2022-11-02 17:24 UTC (permalink / raw)
  To: Ævar Arnfjörð Bjarmason; +Cc: git

On Wed, Nov 02, 2022 at 06:13:51PM +0100, Ævar Arnfjörð Bjarmason wrote:
> > Yeah, I agree. I was mistaken that GIT_TRACE truncated its output when
> > redirected to a file, but it appends. So, the series looks fine to me.
> >
> > I would still like to hear from Emily, but otherwise I don't have a
> > problem starting to merge this down.
>
> (Just looking at what I can & can't unblock)
>
> In case that's a "let's hear from the author" (understandable) then this
> is entirely my work, even if it's her in the "author" header.
>
> Her last version of tha commit was[1], but this entire test is from
> my[2] re-roll of that topic[3].

Fair enough, I didn't realize the original topic in [1] was so old.

Let's merge this down.

Thanks,
Taylor

> 1. https://lore.kernel.org/git/20210527000856.695702-8-emilyshaffer@google.com/
> 2. https://lore.kernel.org/git/patch-03.31-1ad4e69f7da-20210528T110515Z-avarab@gmail.com/
> 3. https://lore.kernel.org/git/cover-00.31-00000000000-20210528T110515Z-avarab@gmail.com/

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: js/bisect-in-c (was: What's cooking in git.git (Oct 2022, #09; Mon, 31))
  2022-11-02 17:22 ` js/bisect-in-c (was: What's cooking in git.git (Oct 2022, #09; Mon, 31)) Ævar Arnfjörð Bjarmason
@ 2022-11-02 17:26   ` Taylor Blau
  2022-11-10 13:35     ` Johannes Schindelin
  2022-11-10 13:32   ` Johannes Schindelin
  1 sibling, 1 reply; 14+ messages in thread
From: Taylor Blau @ 2022-11-02 17:26 UTC (permalink / raw)
  To: Ævar Arnfjörð Bjarmason
  Cc: Taylor Blau, git, Johannes Schindelin

On Wed, Nov 02, 2022 at 06:22:17PM +0100, Ævar Arnfjörð Bjarmason wrote:
>
> On Mon, Oct 31 2022, Taylor Blau wrote:
>
> > What's cooking in git.git (Oct 2022, #09; Mon, 31)
> > --------------------------------------------------
> >
> > * js/bisect-in-c (2022-08-30) 17 commits
> >  . bisect: no longer try to clean up left-over `.git/head-name` files
> >  . bisect: remove Cogito-related code
> >  . Turn `git bisect` into a full built-in
> >  . bisect: move even the command-line parsing to `bisect--helper`
> >  . bisect--helper: make `state` optional
> >  . bisect--helper: calling `bisect_state()` without an argument is a bug
> >  . bisect: avoid double-quoting when printing the failed command
> >  . bisect run: fix the error message
> >  . bisect: verify that a bogus option won't try to start a bisection
> >  . bisect--helper: migrate to OPT_SUBCOMMAND()
> >  . bisect--helper: make the order consistently `argc, argv`
> >  . bisect--helper: make `terms` an explicit singleton
> >  . bisect--helper: simplify exit code computation
> >  . bisect--helper: really retire `--bisect-autostart`
> >  . bisect--helper: really retire --bisect-next-check
> >  . bisect--helper: retire the --no-log option
> >  . Merge branch 'sg/parse-options-subcommand' into js/bisect-in-c
> >
> >  Final bits of "git bisect.sh" have been rewritten in C.
> >
> >  Needs review.
> >  cf. <xmqqv8pr8903.fsf@gitster.g>
> >  source: <pull.1132.v6.git.1661885419.gitgitgadget@gmail.com>
>
> I see this has been ejected out of "seen", presumably due to the
> outstanding conflicts.

If I recall correctly, I ejected this one due to its age and lack of
attention. If you want to reroll it or if Johannes wants to take a look,
I'd be appreciative.

Thanks,
Taylor

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: js/bisect-in-c (was: What's cooking in git.git (Oct 2022, #09; Mon, 31))
  2022-11-02 17:22 ` js/bisect-in-c (was: What's cooking in git.git (Oct 2022, #09; Mon, 31)) Ævar Arnfjörð Bjarmason
  2022-11-02 17:26   ` Taylor Blau
@ 2022-11-10 13:32   ` Johannes Schindelin
  1 sibling, 0 replies; 14+ messages in thread
From: Johannes Schindelin @ 2022-11-10 13:32 UTC (permalink / raw)
  To: Ævar Arnfjörð Bjarmason; +Cc: Taylor Blau, git

[-- Attachment #1: Type: text/plain, Size: 2567 bytes --]

Hi Ævar,

On Wed, 2 Nov 2022, Ævar Arnfjörð Bjarmason wrote:

> On Mon, Oct 31 2022, Taylor Blau wrote:
>
> > What's cooking in git.git (Oct 2022, #09; Mon, 31)
> > --------------------------------------------------
> >
> > * js/bisect-in-c (2022-08-30) 17 commits
> >  . bisect: no longer try to clean up left-over `.git/head-name` files
> >  . bisect: remove Cogito-related code
> >  . Turn `git bisect` into a full built-in
> >  . bisect: move even the command-line parsing to `bisect--helper`
> >  . bisect--helper: make `state` optional
> >  . bisect--helper: calling `bisect_state()` without an argument is a bug
> >  . bisect: avoid double-quoting when printing the failed command
> >  . bisect run: fix the error message
> >  . bisect: verify that a bogus option won't try to start a bisection
> >  . bisect--helper: migrate to OPT_SUBCOMMAND()
> >  . bisect--helper: make the order consistently `argc, argv`
> >  . bisect--helper: make `terms` an explicit singleton
> >  . bisect--helper: simplify exit code computation
> >  . bisect--helper: really retire `--bisect-autostart`
> >  . bisect--helper: really retire --bisect-next-check
> >  . bisect--helper: retire the --no-log option
> >  . Merge branch 'sg/parse-options-subcommand' into js/bisect-in-c
> >
> >  Final bits of "git bisect.sh" have been rewritten in C.
> >
> >  Needs review.
> >  cf. <xmqqv8pr8903.fsf@gitster.g>
> >  source: <pull.1132.v6.git.1661885419.gitgitgadget@gmail.com>
>
> I see this has been ejected out of "seen", presumably due to the
> outstanding conflicts.
>
> To the extent that Johannes doesn't have time I'd by happy to re-roll
> this & look at it/fix whatever outstanding issues I spot.
>
> I gave it a once over a few weeks ago, and didn't see any outstanding
> problems with it worth rewriting in that iteration, but didn't have time
> to give it stress testing to see if there were still some lurking
> unexpected/untested behavior changes.
>
> Johannes?

I saw that this was marked as "Needs review." for quite a while. Seeing as
this patch series has been kept out of `next` for quite a few iterations
basically solely due to your concerns (others have said they're fine with
it), I kind of expected you to give a thumbs-up or a thumbs-down (combined
with clear, concise suggestions how to get this moving again).

So now you say that you did not see any outstanding problems? That would
proabably have been good information for Junio to use to move it along
while it did not conflict.

Ciao,
Johannes

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: js/bisect-in-c (was: What's cooking in git.git (Oct 2022, #09; Mon, 31))
  2022-11-02 17:26   ` Taylor Blau
@ 2022-11-10 13:35     ` Johannes Schindelin
  2022-11-11  4:46       ` Taylor Blau
  2022-11-11 14:11       ` Ævar Arnfjörð Bjarmason
  0 siblings, 2 replies; 14+ messages in thread
From: Johannes Schindelin @ 2022-11-10 13:35 UTC (permalink / raw)
  To: Taylor Blau; +Cc: Ævar Arnfjörð Bjarmason, git

[-- Attachment #1: Type: text/plain, Size: 2673 bytes --]

Hi Taylor,

On Wed, 2 Nov 2022, Taylor Blau wrote:

> On Wed, Nov 02, 2022 at 06:22:17PM +0100, Ævar Arnfjörð Bjarmason wrote:
> >
> > On Mon, Oct 31 2022, Taylor Blau wrote:
> >
> > > What's cooking in git.git (Oct 2022, #09; Mon, 31)
> > > --------------------------------------------------
> > >
> > > * js/bisect-in-c (2022-08-30) 17 commits
> > >  . bisect: no longer try to clean up left-over `.git/head-name` files
> > >  . bisect: remove Cogito-related code
> > >  . Turn `git bisect` into a full built-in
> > >  . bisect: move even the command-line parsing to `bisect--helper`
> > >  . bisect--helper: make `state` optional
> > >  . bisect--helper: calling `bisect_state()` without an argument is a bug
> > >  . bisect: avoid double-quoting when printing the failed command
> > >  . bisect run: fix the error message
> > >  . bisect: verify that a bogus option won't try to start a bisection
> > >  . bisect--helper: migrate to OPT_SUBCOMMAND()
> > >  . bisect--helper: make the order consistently `argc, argv`
> > >  . bisect--helper: make `terms` an explicit singleton
> > >  . bisect--helper: simplify exit code computation
> > >  . bisect--helper: really retire `--bisect-autostart`
> > >  . bisect--helper: really retire --bisect-next-check
> > >  . bisect--helper: retire the --no-log option
> > >  . Merge branch 'sg/parse-options-subcommand' into js/bisect-in-c
> > >
> > >  Final bits of "git bisect.sh" have been rewritten in C.
> > >
> > >  Needs review.
> > >  cf. <xmqqv8pr8903.fsf@gitster.g>
> > >  source: <pull.1132.v6.git.1661885419.gitgitgadget@gmail.com>
> >
> > I see this has been ejected out of "seen", presumably due to the
> > outstanding conflicts.
>
> If I recall correctly, I ejected this one due to its age and lack of
> attention. If you want to reroll it or if Johannes wants to take a look,
> I'd be appreciative.

My last information was that I sent an iteration that was designed to
address all outstanding concerns, including a rather major haul to put
this on top of the new `OPT_SUBCOMMAND` feature that wasn't even dreamed
of when I sent v1 of `bisect-in-c`, and then I only saw "Needs review."
for several weeks and nobody objecting but also in particular Ævar (who
raised concerns against this patch series several times over the last 10
months) not chiming in with a "go ahead".

So basically, I thought this was finally done and the next thing I hear is
that it is ejected. That's quite a frustrating experience, I must admit.
At least I am not a new contributor who would be very much deterred from
contributing any further by such an experience.

Ciao,
Dscho

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: js/bisect-in-c (was: What's cooking in git.git (Oct 2022, #09; Mon, 31))
  2022-11-10 13:35     ` Johannes Schindelin
@ 2022-11-11  4:46       ` Taylor Blau
  2022-11-11 14:11       ` Ævar Arnfjörð Bjarmason
  1 sibling, 0 replies; 14+ messages in thread
From: Taylor Blau @ 2022-11-11  4:46 UTC (permalink / raw)
  To: Johannes Schindelin
  Cc: Taylor Blau, Ævar Arnfjörð Bjarmason, git

On Thu, Nov 10, 2022 at 02:35:26PM +0100, Johannes Schindelin wrote:
> So basically, I thought this was finally done and the next thing I hear is
> that it is ejected. That's quite a frustrating experience, I must admit.
> At least I am not a new contributor who would be very much deterred from
> contributing any further by such an experience.

I ejected the series for two reasons:

  - it began to conflict with newer series that folks are working on,
    and

  - because I hadn't seen any activity on it from either you or any of
    the previous reviewers.

I don't want to drop the topic on the floor if we are getting close to
or are at the finish line. *But*, there are a handful of other series in
flight which seem to conflict with this one.

It would have been much nicer to graduate this earlier, and certainly I
think some reviewer-signaling could have helped that.

But now that other topics have appeared, it would be nice to see a
rerolled version on top of any topic(s) with which it might conflict.
That, along with clear instructions of which topics it depends on will
help me queue it in the right order.

If it helps, I can try and take a closer look tomorrow when rebuilding
'seen' with the new topics. It may be possible for me to resolve the
conflicts with minimal effort. If it appears in 'seen', then you should
be OK, and we can start graduating this down. But if not, then having a
rerolled version would be very much appreciated.

Thanks,
Taylor

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: js/bisect-in-c (was: What's cooking in git.git (Oct 2022, #09; Mon, 31))
  2022-11-10 13:35     ` Johannes Schindelin
  2022-11-11  4:46       ` Taylor Blau
@ 2022-11-11 14:11       ` Ævar Arnfjörð Bjarmason
  1 sibling, 0 replies; 14+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2022-11-11 14:11 UTC (permalink / raw)
  To: Johannes Schindelin
  Cc: Taylor Blau, git, Đoàn Trần Công Danh


On Thu, Nov 10 2022, Johannes Schindelin wrote:

> Hi Taylor,
>
> On Wed, 2 Nov 2022, Taylor Blau wrote:
>
>> On Wed, Nov 02, 2022 at 06:22:17PM +0100, Ævar Arnfjörð Bjarmason wrote:
>> >
>> > On Mon, Oct 31 2022, Taylor Blau wrote:
>> >
>> > > What's cooking in git.git (Oct 2022, #09; Mon, 31)
>> > > --------------------------------------------------
>> > >
>> > > * js/bisect-in-c (2022-08-30) 17 commits
>> > >  . bisect: no longer try to clean up left-over `.git/head-name` files
>> > >  . bisect: remove Cogito-related code
>> > >  . Turn `git bisect` into a full built-in
>> > >  . bisect: move even the command-line parsing to `bisect--helper`
>> > >  . bisect--helper: make `state` optional
>> > >  . bisect--helper: calling `bisect_state()` without an argument is a bug
>> > >  . bisect: avoid double-quoting when printing the failed command
>> > >  . bisect run: fix the error message
>> > >  . bisect: verify that a bogus option won't try to start a bisection
>> > >  . bisect--helper: migrate to OPT_SUBCOMMAND()
>> > >  . bisect--helper: make the order consistently `argc, argv`
>> > >  . bisect--helper: make `terms` an explicit singleton
>> > >  . bisect--helper: simplify exit code computation
>> > >  . bisect--helper: really retire `--bisect-autostart`
>> > >  . bisect--helper: really retire --bisect-next-check
>> > >  . bisect--helper: retire the --no-log option
>> > >  . Merge branch 'sg/parse-options-subcommand' into js/bisect-in-c
>> > >
>> > >  Final bits of "git bisect.sh" have been rewritten in C.
>> > >
>> > >  Needs review.
>> > >  cf. <xmqqv8pr8903.fsf@gitster.g>
>> > >  source: <pull.1132.v6.git.1661885419.gitgitgadget@gmail.com>
>> >
>> > I see this has been ejected out of "seen", presumably due to the
>> > outstanding conflicts.
>>
>> If I recall correctly, I ejected this one due to its age and lack of
>> attention. If you want to reroll it or if Johannes wants to take a look,
>> I'd be appreciative.

[Replying here instead of <s024qpqn-0roo-3rr2-nr4p-74p9296r6p02@tzk.qr>,
but take this as a reply to that as well]

> My last information was that I sent an iteration that was designed to
> address all outstanding concerns, including a rather major haul to put
> this on top of the new `OPT_SUBCOMMAND` feature that wasn't even dreamed
> of when I sent v1 of `bisect-in-c`, and then I only saw "Needs review."
> for several weeks and nobody objecting but also in particular Ævar (who
> raised concerns against this patch series several times over the last 10
> months) not chiming in with a "go ahead".

I think that "go ahead" from me was pretty unambiguous in [1], i.e. I said:

	"I think as it stands that it's a net improvement on "master". I
	would not mind it advanced in its current state. We can fix any
	outstanding issues with it later, particularly due to what seem
	like time constraints on your end[...]"

> So basically, I thought this was finally done and the next thing I hear is
> that it is ejected. [...]

What you're eliding here is that on the 4th Lukáš Doktor reported a
regression in "git bisect" that pre-dated your cooking topic[2].

You didn't participate in that discussion, except now to say that you
weren't motivated to review parts of the proposed fixes for that
regression it[3].

Which is relevant because in your topic you spend a lot of time
converting various code for the supposed needs of a migration to
OPT_SUBCOMMAND()[4]. Just the diffstat for that was:

 1 file changed, 128 insertions(+), 134 deletions(-)

Which didn't get all the way to the full OPT_SUBCOMMAND(). That still
needed [5] and [6], which are, respectively:

 1 file changed, 14 insertions(+), 15 deletions(-)
 2 files changed, 288 insertions(+), 194 deletions(-)

Whereas Đoàn's "dd/bisect-helper-subcommand", which is now in "next",
and which was aiming for the shortest route to fixing that regression,
and which also gave us OPT_SUBCOMMAND() is:

 3 files changed, 142 insertions(+), 120 deletions(-)

This is all around 2 months after Junio's feedback on your latest
iteration was also questioning the need for that rewrite to get to the
goal of OPT_SUBCOMMAND()[7].

> That's quite a frustrating experience, I must admit.
> At least I am not a new contributor who would be very much deterred from
> contributing any further by such an experience.

It's been frustrating for me too, particularly the as this isn't the
first time that I feel like you're outright misrepresenting something
I've said or done.

But I really don't think any of this translates to some general
unfriendliness on the list that new contributors would run into.

To take just the above example: New contributors aren't sending hundreds
of lines of patches to get to a stated goal of "X" by doing "A", and
then ignoring or dismissing reviews when it's pointed out to them that
they can get to "X" in a much easier manner by doing "B" instead.

Your original topic is a daunting:

 7 files changed, 406 insertions(+), 388 deletions(-)

Which, as noted above the replacement of Đoàn's
"dd/bisect-helper-subcommand" is:

 3 files changed, 142 insertions(+), 120 deletions(-)

And his "dd/git-bisect-builtin" in seen is:

 5 files changed, 77 insertions(+), 58 deletions(-)

Does that get us all the same thing sas js/bisect-in-c? No. But it does
get us to the primary goal whith fewer changes, which I think is the
main reason why your series has had such a hard time advancing.

1. https://lore.kernel.org/git/220819.86sfls6zhh.gmgdl@evledraar.gmail.com/
2. https://lore.kernel.org/git/1cb1c033-0525-7e62-8c09-81019bf26060@redhat.com/
3. https://lore.kernel.org/git/2477861r-9363-75sn-q415-o19206q70p90@tzk.qr/
4. https://lore.kernel.org/git/92b3b116ef8f879192d9deb94d68b73e29d5dcd6.1661885419.git.gitgitgadget@gmail.com/
5. https://lore.kernel.org/git/c9dc0281e38bf9bc0bce72de172b5dbadbcbb1f5.1661885419.git.gitgitgadget@gmail.com/
6. https://lore.kernel.org/git/e97e187bbec93b47f35e3dd42b4831f1c1d8658d.1661885419.git.gitgitgadget@gmail.com/
7. https://lore.kernel.org/git/xmqqmtblighr.fsf@gitster.g/

^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2022-11-11 14:52 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-31  5:31 What's cooking in git.git (Oct 2022, #09; Mon, 31) Taylor Blau
2022-10-31 23:44 ` ab/cmake-nix-and-ci (was: What's cooking in git.git (Oct 2022, #09; Mon, 31)) Ævar Arnfjörð Bjarmason
2022-10-31 23:45 ` ab/make-bin-wrappers " Ævar Arnfjörð Bjarmason
2022-10-31 23:46 ` ab/misc-hook-submodule-run-command " Ævar Arnfjörð Bjarmason
2022-11-01  0:15   ` Taylor Blau
2022-11-02 17:13     ` Ævar Arnfjörð Bjarmason
2022-11-02 17:24       ` Taylor Blau
2022-11-02 16:49 ` What's cooking in git.git (Oct 2022, #09; Mon, 31) Ramsay Jones
2022-11-02 17:22 ` js/bisect-in-c (was: What's cooking in git.git (Oct 2022, #09; Mon, 31)) Ævar Arnfjörð Bjarmason
2022-11-02 17:26   ` Taylor Blau
2022-11-10 13:35     ` Johannes Schindelin
2022-11-11  4:46       ` Taylor Blau
2022-11-11 14:11       ` Ævar Arnfjörð Bjarmason
2022-11-10 13:32   ` Johannes Schindelin

Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).