{"thread":{"id":"48798","subject":"What's cooking in git.git (Jun 2018, #07; Thu, 28)","startedAt":"2018-06-28T21:40:39Z","lastAt":"2018-07-09T18:13:33Z","messageCount":24,"participants":["Junio C Hamano","Stefan Beller","Alban Gruin","Derrick Stolee","Ævar Arnfjörð Bjarmason","Johannes Schindelin","Elijah Newren","Eric Sunshine","Jonathan Tan"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"351261","messageId":"xmqqd0wawpwy.fsf@gitster-ct.c.googlers.com","threadId":"48798","inReplyTo":null,"subject":"What's cooking in git.git (Jun 2018, #07; Thu, 28)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-06-28T21:40:29Z","receivedAt":"2018-06-28T21:40:39Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Here are the topics that have been cooking.  Commits prefixed with\n'-' are only in 'pu' (proposed updates) while commits prefixed with\n'+' are in 'next'.  The ones marked with '.' do not appear in any of\nthe integration branches, but I am still holding onto them.\n\nThe tip of 'next' has been rewound and it currently has only 4\ntopics.  Quite a many topics are cooking in 'pu' and need to be\nsifted into good bins (for 'next') and the remainder.  Help is\nappreciated in that area ;-)\n\nYou can find the changes described here in the integration branches\nof the repositories listed at\n\n    http://git-blame.blogspot.com/p/git-public-repositories.html\n\n--------------------------------------------------\n[Graduated to \"master\"]\n\n* ab/refspec-init-fix (2018-06-11) 3 commits\n  (merged to 'next' on 2018-06-13 at 91d71d8435)\n + refspec: initalize `refspec_item` in `valid_fetch_refspec()`\n + refspec: add back a refspec_item_init() function\n + refspec: s/refspec_item_init/&_or_die/g\n\n Make refspec parsing codepath more robust.\n\n\n* as/safecrlf-quiet-fix (2018-06-11) 1 commit\n  (merged to 'next' on 2018-06-13 at b163674843)\n + config.c: fix regression for core.safecrlf false\n\n Fix for 2.17-era regression around `core.safecrlf`.\n\n\n* jc/clean-after-sanity-tests (2018-06-15) 1 commit\n  (merged to 'next' on 2018-06-22 at 2df77b8af9)\n + tests: clean after SANITY tests\n\n test cleanup.\n\n\n* jh/partial-clone (2018-06-12) 1 commit\n  (merged to 'next' on 2018-06-13 at 818f864b0c)\n + list-objects: check if filter is NULL before using\n\n The recent addition of \"partial clone\" experimental feature kicked\n in when it shouldn't, namely, when there is no partial-clone filter\n defined even if extensions.partialclone is set.\n\n\n* jk/fetch-all-peeled-fix (2018-06-13) 2 commits\n  (merged to 'next' on 2018-06-13 at 1333bb9d90)\n + fetch-pack: test explicitly that --all can fetch tag references pointing to non-commits\n + fetch-pack: don't try to fetch peel values with --all\n\n \"git fetch-pack --all\" used to unnecessarily fail upon seeing an\n annotated tag that points at an object other than a commit.\n\n\n* ms/send-pack-honor-config (2018-06-12) 1 commit\n  (merged to 'next' on 2018-06-13 at e2cd933715)\n + builtin/send-pack: populate the default configs\n\n \"git send-pack --signed\" (hence \"git push --signed\" over the http\n transport) did not read user ident from the config mechanism to\n determine whom to sign the push certificate as, which has been\n corrected.\n\n\n* nd/completion-negation (2018-06-11) 3 commits\n  (merged to 'next' on 2018-06-19 at a3be59b450)\n + completion: collapse extra --no-.. options\n + completion: suppress some -no- options\n + parse-options: option to let --git-completion-helper show negative form\n\n Continuing with the idea to programmatically enumerate various\n pieces of data required for command line completion, the codebase\n has been taught to enumerate options prefixed with \"--no-\" to\n negate them.\n\n\n* pw/add-p-recount (2018-06-11) 1 commit\n  (merged to 'next' on 2018-06-19 at 1880ecc3f1)\n + add -p: fix counting empty context lines in edited patches\n\n When user edits the patch in \"git add -p\" and the user's editor is\n set to strip trailing whitespaces indiscriminately, an empty line\n that is unchanged in the patch would become completely empty\n (instead of a line with a sole SP on it).  The code introduced in\n Git 2.17 timeframe failed to parse such a patch, but now it learned\n to notice the situation and cope with it.\n\n\n* sb/fix-fetching-moved-submodules (2018-06-14) 2 commits\n  (merged to 'next' on 2018-06-22 at 16039dc62a)\n + t5526: test recursive submodules when fetching moved submodules\n + submodule: fix NULL correctness in renamed broken submodules\n\n The code to try seeing if a fetch is necessary in a submodule\n during a fetch with --recurse-submodules got confused when the path\n to the submodule was changed in the range of commits in the\n superproject, sometimes showing \"(null)\".  This has been corrected.\n\n\n* sg/gpg-tests-fix (2018-06-11) 2 commits\n  (merged to 'next' on 2018-06-13 at f3a05f1c41)\n + tests: make forging GPG signed commits and tags more robust\n + t7510-signed-commit: use 'test_must_fail'\n\n Some flaky tests have been fixed.\n\n\n* tz/cred-netrc-cleanup (2018-06-18) 4 commits\n  (merged to 'next' on 2018-06-22 at a471dd714c)\n + git-credential-netrc: make \"all\" default target of Makefile\n + git-credential-netrc: fix exit status when tests fail\n + git-credential-netrc: use in-tree Git.pm for tests\n + git-credential-netrc: minor whitespace cleanup in test script\n\n Build and test procedure for netrc credential helper (in contrib/)\n has been updated.\n\n--------------------------------------------------\n[New Topics]\n\n* ao/config-from-gitmodules (2018-06-26) 6 commits\n - submodule-config: reuse config_from_gitmodules in repo_read_gitmodules\n - submodule-config: pass repository as argument to config_from_gitmodules\n - submodule-config: make 'config_from_gitmodules' private\n - submodule-config: add helper to get 'update-clone' config from .gitmodules\n - submodule-config: add helper function to get 'fetch' config from .gitmodules\n - config: move config_from_gitmodules to submodule-config.c\n\n Tighten the API to make it harder to misuse in-tree .gitmodules\n file, even though it shares the same syntax with configuration\n files, to read random configuration items from it.\n\n Will merge to 'next'.\n\n\n* as/sequencer-customizable-comment-char (2018-06-28) 1 commit\n - sequencer: use configured comment character\n\n Honor core.commentchar when preparing the list of commits to replay\n in \"rebase -i\".\n \n\n* dj/runtime-prefix (2018-06-26) 1 commit\n - Makefile: tweak sed invocation\n\n POSIX portability fix in Makefile to fix a glitch introduced a few\n releases ago.\n\n Will merge to 'next'.\n\n\n* ds/commit-graph (2018-06-28) 1 commit\n - commit-graph: fix documentation inconsistencies\n\n Docfix.\n\n Will merge to 'next'.\n\n\n* en/rebase-i-microfixes (2018-06-27) 3 commits\n - git-rebase--merge: modernize \"git-$cmd\" to \"git $cmd\"\n - Fix use of strategy options with interactive rebases\n - t3418: add testcase showing problems with rebase -i and strategy options\n\n Will merge to 'next'.\n\n\n* js/enhanced-version-info (2018-06-28) 1 commit\n - Makefile: fix the \"built from commit\" code\n\n Build fix.\n\n Will merge to 'next'.\n\n\n* js/rebase-recreate-merge (2018-06-27) 1 commit\n - rebase: fix documentation formatting\n\n Docfix.\n\n Will merge to 'next'.\n\n\n* jt/connectivity-check-after-unshallow (2018-06-27) 1 commit\n - fetch: when deepening, check connectivity fully\n\n \"git fetch\" failed to correctly validate the set of objects it\n received when making a shallow history deeper, which has been\n corrected.\n\n\n* jt/fetch-nego-tip (2018-06-27) 1 commit\n - fetch-pack: support negotiation tip whitelist\n (this branch uses jt/fetch-pack-negotiator.)\n\n \"git fetch\" learned a new option \"--negotiation-tip\" to limit the\n set of commits it tells the other end as \"have\", to reduce wasted\n bandwidth and cycles, which would be helpful when the receiving\n repository has a lot of refs that have little to do with the\n history at the remote it is fetching from.\n\n\n* mb/filter-branch-optim (2018-06-26) 1 commit\n - filter-branch: skip commits present on --state-branch\n\n \"git filter-branch\" when used with the \"--state-branch\" option\n still attempted to rewrite the commits whose filtered result is\n known from the previous attempt (which is recorded on the state\n branch); the command has been corrected not to waste cycles doing\n so.\n\n Will merge to 'next'.\n\n\n* ms/core-icase-doc (2018-06-28) 1 commit\n - Documentation: declare \"core.ignoreCase\" as internal variable\n\n Clarify that setting core.ignoreCase to deviate from reality would\n not turn a case-incapable filesystem into a case-capable one.\n\n Will merge to 'next'.\n\n\n* rj/submodule-fsck-skip (2018-06-27) 1 commit\n - fsck: check skiplist for object in fsck_blob()\n\n \"fsck.skipList\" did not prevent a blob object listed there from\n being inspected for is contents (e.g. we recently started to\n inspect the contents of \".gitmodules\" for certain malicious\n patterns), which has been corrected.\n\n Will merge to 'next'.\n\n\n* tb/grep-only-matching (2018-06-27) 3 commits\n - SQUASH??? emerg compilation fix\n - grep.c: teach 'git grep --only-matching'\n - grep.c: extract show_line_header()\n (this branch uses tb/grep-column.)\n\n \"git grep\" learned the \"--only-matching\" option.\n\n\n* tz/exclude-doc-smallfixes (2018-06-27) 2 commits\n - dir.c: fix typos in core.excludesfile comment\n - gitignore.txt: clarify default core.excludesfile path\n\n Doc updates.\n\n Will merge to 'next'.\n\n--------------------------------------------------\n[Stalled]\n\n* ab/fetch-tags-noclobber (2018-05-16) 9 commits\n - fixup! push tests: assert re-pushing annotated tags\n - fetch: stop clobbering existing tags without --force\n - fetch tests: add a test clobbering tag behavior\n - fetch tests: correct a comment \"remove it\" -> \"remove them\"\n - push doc: correct lies about how push refspecs work\n - push tests: assert re-pushing annotated tags\n - push tests: add more testing for forced tag pushing\n - push tests: fix logic error in \"push\" test assertion\n - push tests: remove redundant 'git push' invocation\n\n Expecting a reboot of the discussion to take it to some conclusion\n and then a reroll.\n cf. <f3b891c3-381f-de42-51d8-24fdfbca91d2@gmail.com>\n cf. <xmqq603yn50l.fsf@gitster-ct.c.googlers.com>\n cf. <xmqqzi1alodz.fsf@gitster-ct.c.googlers.com>\n cf. <xmqqvabylnbi.fsf@gitster-ct.c.googlers.com>\n\n\n* pw/add-p-select (2018-03-16) 3 commits\n - add -p: optimize line selection for short hunks\n - add -p: allow line selection to be inverted\n - add -p: select individual hunk lines\n\n \"git add -p\" interactive interface learned to let users choose\n individual added/removed lines to be used in the operation, instead\n of accepting or rejecting a whole hunk.\n\n Expecting a reroll to reignite the discussion.\n cf. <9895c7b7-eac4-28c1-90c6-443acd1131b7@talktalk.net>\n\n\n* jh/json-writer (2018-06-13) 1 commit\n - json_writer: new routines to create JSON data\n\n Preparatory code to later add json output for unspecified telemetry\n data.\n\n We do not add random code that does not have real users to our\n codebase, so let's have it wait until such a real code materializes\n before too long.\n\n\n* hn/bisect-first-parent (2018-04-21) 1 commit\n - bisect: create 'bisect_flags' parameter in find_bisection()\n\n Preliminary code update to allow passing more flags down the\n bisection codepath in the future.\n\n We do not add random code that does not have real users to our\n codebase, so let's have it wait until such a real code materializes\n before too long.\n\n\n* av/fsmonitor-updates (2018-01-04) 6 commits\n - fsmonitor: use fsmonitor data in `git diff`\n - fsmonitor: remove debugging lines from t/t7519-status-fsmonitor.sh\n - fsmonitor: make output of test-dump-fsmonitor more concise\n - fsmonitor: update helper tool, now that flags are filled later\n - fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid\n - dir.c: update comments to match argument name\n\n Code clean-up on fsmonitor integration, plus optional utilization\n of the fsmonitor data in diff-files.\n\n Waiting for an update.\n cf. <alpine.DEB.2.21.1.1801042335130.32@MININT-6BKU6QN.europe.corp.microsoft.com>\n\n\n* pb/bisect-helper-2 (2018-06-13) 8 commits\n - t6030: make various test to pass GETTEXT_POISON tests\n - bisect--helper: `bisect_start` shell function partially in C\n - bisect--helper: `get_terms` & `bisect_terms` shell function in C\n - bisect--helper: `bisect_next_check` shell function in C\n - bisect--helper: `check_and_set_terms` shell function in C\n - wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()\n - bisect--helper: `bisect_write` shell function in C\n - bisect--helper: `bisect_reset` shell function in C\n\n Expecting a reroll.\n cf. <0102015f5e5ee171-f30f4868-886f-47a1-a4e4-b4936afc545d-000000@eu-west-1.amazonses.com>\n\n I just rebased the topic to a newer base as it did not build\n standalone with the base I originally queued the topic on, but\n otherwise there is no update to address any of the review comments\n in the thread above---we are still waiting for a reroll.\n\n\n* mk/http-backend-content-length (2018-06-11) 3 commits\n - http-backend: respect CONTENT_LENGTH for receive-pack\n - http-backend: respect CONTENT_LENGTH as specified by rfc3875\n - http-backend: cleanup writing to child process\n\n The http-backend (used for smart-http transport) used to slurp the\n whole input until EOF, without paying attention to CONTENT_LENGTH\n that is supplied in the environment and instead expecting the Web\n server to close the input stream.  This has been fixed.\n\n\n* jk/drop-ancient-curl (2017-08-09) 5 commits\n - http: #error on too-old curl\n - curl: remove ifdef'd code never used with curl >=7.19.4\n - http: drop support for curl < 7.19.4\n - http: drop support for curl < 7.16.0\n - http: drop support for curl < 7.11.1\n\n Some code in http.c that has bitrot is being removed.\n\n Expecting a reroll.\n\n\n* mk/use-size-t-in-zlib (2017-08-10) 1 commit\n . zlib.c: use size_t for size\n\n The wrapper to call into zlib followed our long tradition to use\n \"unsigned long\" for sizes of regions in memory, which have been\n updated to use \"size_t\".\n\n Needs resurrecting by making sure the fix is good and still applies\n (or adjusted to today's codebase).\n\n--------------------------------------------------\n[Cooking]\n\n* ld/p423 (2018-06-19) 6 commits\n - git-p4: python3: fix octal constants\n - git-p4: python3: use print() function\n - git-p4: python3: basestring workaround\n - git-p4: python3: remove backticks\n - git-p4: python3: replace dict.has_key(k) with \"k in dict\"\n - git-p4: python3: replace <> with !=\n\n Code preparation to make \"git p4\" closer to be usable with Python 3.\n\n Will merge to 'next'.\n\n\n* pw/rebase-i-keep-reword-after-conflict (2018-06-19) 1 commit\n - sequencer: do not squash 'reword' commits when we hit conflicts\n\n Bugfix for \"rebase -i\" corner case regression.\n\n Will merge to 'next'.\n\n\n* xy/format-patch-prereq-patch-id-fix (2018-06-19) 1 commit\n - format-patch: clear UNINTERESTING flag before prepare_bases\n\n Recently added \"--base\" option to \"git format-patch\" command did\n not correctly generate prereq patch ids.\n\n Will merge to 'next'.\n\n\n* bw/config-refer-to-gitsubmodules-doc (2018-06-21) 1 commit\n - docs: link to gitsubmodules\n\n Docfix.\n\n Will merge to 'next'.\n\n\n* bw/ref-in-want (2018-06-28) 8 commits\n - fetch-pack: implement ref-in-want\n - fetch-pack: put shallow info in output parameter\n - fetch: refactor to make function args narrower\n - fetch: refactor fetch_refs into two functions\n - fetch: refactor the population of peer ref OIDs\n - upload-pack: test negotiation with changing repository\n - upload-pack: implement ref-in-want\n - test-pkt-line: add unpack-sideband subcommand\n\n Protocol v2 has been updated to allow slightly out-of-sync set of\n servers to work together to serve a single client, which would be\n useful with load-balanced servers that talk smart HTTP transport.\n\n\n* en/rebase-consistency (2018-06-27) 9 commits\n - git-rebase: make --allow-empty-message the default\n - t3401: add directory rename testcases for rebase and am\n - git-rebase.txt: document behavioral differences between modes\n - directory-rename-detection.txt: technical docs on abilities and limitations\n - git-rebase.txt: address confusion between --no-ff vs --force-rebase\n - git-rebase: error out when incompatible options passed\n - t3422: new testcases for checking when incompatible options passed\n - git-rebase.sh: update help messages a bit\n - git-rebase.txt: document incompatible options\n\n \"git rebase\" behaved slightly differently depending on which one of\n the three backends gets used; this has been documented and an\n effort to make them more uniform has begun.\n\n\n* jt/remove-pack-bitmap-global (2018-06-21) 2 commits\n - pack-bitmap: add free function\n - pack-bitmap: remove bitmap_git global variable\n\n The effort to move globals to per-repository in-core structure\n continues.\n\n\n* sb/submodule-move-head-error-msg (2018-06-25) 1 commit\n - submodule.c: report the submodule that an error occurs in\n\n Needs a reroll.\n cf. <20180622081713.5360-1-szeder.dev@gmail.com>\n\n\n* bw/protocol-v2 (2018-06-22) 1 commit\n - protocol-v2 doc: put HTTP headers after request\n\n Doc fix.\n\n Will merge to 'next'.\n\n\n* jk/branch-l-1-repurpose (2018-06-22) 1 commit\n - branch: make \"-l\" a synonym for \"--list\"\n (this branch uses jk/branch-l-0-deprecation.)\n\n Updated plan to repurpose the \"-l\" option to \"git branch\".\n\n Will hold in 'pu' until jk/branch-l-0-deprecation progresses sufficiently.\n\n\n* vs/typofixes (2018-06-22) 1 commit\n - Documentation: spelling and grammar fixes\n\n Doc fix.\n\n Will merge to 'next'.\n\n\n* cc/remote-odb (2018-06-25) 9 commits\n . Documentation/config: add odb.<name>.promisorRemote\n . t0410: test fetching from many promisor remotes\n . Use odb.origin.partialclonefilter instead of core.partialclonefilter\n . Use remote_odb_get_direct() and has_remote_odb()\n . remote-odb: add remote_odb_reinit()\n . remote-odb: implement remote_odb_get_many_direct()\n . remote-odb: implement remote_odb_get_direct()\n . Add initial remote odb support\n . fetch-object: make functions return an error code\n\n Needs a reroll.\n\n\n* ds/multi-pack-index (2018-06-25) 24 commits\n - midx: clear midx on repack\n - packfile: skip loading index if in multi-pack-index\n - midx: prevent duplicate packfile loads\n - midx: use midx in approximate_object_count\n - midx: use existing midx when writing new one\n - midx: use midx in abbreviation calculations\n - midx: read objects from multi-pack-index\n - midx: prepare midxed_git struct\n - config: create core.multiPackIndex setting\n - midx: write object offsets\n - midx: write object id fanout chunk\n - midx: write object ids in a chunk\n - midx: sort and deduplicate objects from packfiles\n - midx: read pack names into array\n - multi-pack-index: write pack names in chunk\n - multi-pack-index: read packfile list\n - packfile: generalize pack directory list\n - multi-pack-index: expand test data\n - multi-pack-index: load into memory\n - midx: write header information to lockfile\n - multi-pack-index: add 'write' verb\n - multi-pack-index: add builtin\n - multi-pack-index: add format details\n - multi-pack-index: add design document\n\n When there are too many packfiles in a repository (which is not\n recommended), looking up an object in these would require\n consulting many pack .idx files; a new mechanism to have a single\n file that consolidates all of these .idx files is introduced.\n\n\n* nd/use-the-index-compat-less (2018-06-25) 13 commits\n - wt-status.c: stop using index compat macros\n - sha1-name.c: stop using index compat macros\n - sequencer.c: stop using index compat macros\n - revision.c: stop using index compat macros\n - rerere.c: stop using index compat macros\n - merge.c: stop using index compat macros\n - merge-recursive.c: stop using index compat macros\n - entry.c: stop using index compat macros\n - diff.c: stop using index compat macros\n - diff-lib.c: stop using index compat macros\n - check-racy.c: stop using index compat macros\n - blame.c: stop using index compat macros\n - apply.c: stop using index compat macros\n\n Use of many convenience functions that operate on the_index\n \"primary in-core index instance\" have been rewritten to explicitly\n call the coutnerpart functions that take arbitrary index_state and\n pass the_index.\n\n I'd say that alone is a useless code churn, but people seem to be\n excited about the change, so it is queued here.\n\n\n* tb/grep-column (2018-06-22) 7 commits\n - contrib/git-jump/git-jump: jump to exact location\n - grep.c: add configuration variables to show matched option\n - builtin/grep.c: add '--column' option to 'git-grep(1)'\n - grep.c: display column number of first match\n - grep.[ch]: extend grep_opt to allow showing matched column\n - grep.c: expose {,inverted} match column in match_line()\n - Documentation/config.txt: camel-case lineNumber for consistency\n (this branch is used by tb/grep-only-matching.)\n\n \"git grep\" learned the \"--column\" option that gives not just the\n line number but the column number of the hit.\n\n Will merge to 'next'.\n\n\n* jt/fetch-pack-negotiator (2018-06-15) 7 commits\n - fetch-pack: introduce negotiator API\n - fetch-pack: move common check and marking together\n - fetch-pack: make negotiation-related vars local\n - fetch-pack: use ref adv. to prune \"have\" sent\n - fetch-pack: directly end negotiation if ACK ready\n - fetch-pack: clear marks before re-marking\n - fetch-pack: split up everything_local()\n (this branch is used by jt/fetch-nego-tip.)\n\n Code restructuring and a small fix to transport protocol v2 during\n fetching.\n\n Is this ready for 'next'?\n\n\n* ag/rebase-i-append-todo-help (2018-06-14) 2 commits\n - rebase--interactive: rewrite append_todo_help() in C\n - Merge branch 'ag/rebase-p' into ag/rebase-i-append-todo-help\n (this branch is used by ag/rebase-i-rewrite-todo.)\n\n Stepwise rewriting of the machinery of \"rebase -i\" into C continues.\n\n Needs a reroll.\n cf. <nycvar.QRO.7.76.6.1806261125330.21419@tvgsbejvaqbjf.bet>\n\n\n* ag/rebase-i-rewrite-todo (2018-06-15) 3 commits\n - rebase--interactive: rewrite the edit-todo functionality in C\n - editor: add a function to launch the sequence editor\n - Merge branch 'bc/t3430-fixup' into ag/rebase-i-rewrite-todo\n (this branch uses ag/rebase-i-append-todo-help.)\n\n Stepwise rewriting of the machinery of \"rebase -i\" into C continues.\n\n\n* sb/submodule-core-worktree (2018-06-19) 3 commits\n  (merged to 'next' on 2018-06-28 at 96e1a8dbd1)\n + submodule deinit: unset core.worktree\n + submodule: ensure core.worktree is set after update\n + submodule: unset core.worktree if no working tree is present\n\n Originally merged to 'next' on 2018-06-22\n\n \"git submodule\" did not correctly adjust core.worktree setting that\n indicates whether/where a submodule repository has its associated\n working tree across various state transitions, which has been\n corrected.\n\n Will merge to 'master'.\n\n\n* ds/ewah-cleanup (2018-06-21) 10 commits\n  (merged to 'next' on 2018-06-28 at 9cd7c0d54a)\n + ewah: delete unused 'rlwit_discharge_empty()'\n + ewah: drop ewah_serialize_native function\n + ewah: drop ewah_deserialize function\n + ewah_io: delete unused 'ewah_serialize()'\n + ewah_bitmap: delete unused 'ewah_or()'\n + ewah_bitmap: delete unused 'ewah_not()'\n + ewah_bitmap: delete unused 'ewah_and_not()'\n + ewah_bitmap: delete unused 'ewah_and()'\n + ewah/bitmap.c: delete unused 'bitmap_each_bit()'\n + ewah/bitmap.c: delete unused 'bitmap_clear()'\n\n Originally merged to 'next' on 2018-06-22\n\n Remove unused function definitions and declarations from ewah\n bitmap subsystem.\n\n Will merge to 'master'.\n\n\n* is/parsing-line-range (2018-06-15) 2 commits\n - log: prevent error if line range ends past end of file\n - blame: prevent error if range ends past end of file\n\n Parsing of -L[<N>][,[<M>]] parameters \"git blame\" and \"git log\"\n take has been tweaked.\n\n\n* en/merge-recursive-cleanup (2018-06-12) 6 commits\n  (merged to 'next' on 2018-06-28 at 1a3646eb7d)\n + merge-recursive: add pointer about unduly complex looking code\n + merge-recursive: rename conflict_rename_*() family of functions\n + merge-recursive: clarify the rename_dir/RENAME_DIR meaning\n + merge-recursive: align labels with their respective code blocks\n + merge-recursive: fix numerous argument alignment issues\n + merge-recursive: fix miscellaneous grammar error in comment\n\n Originally merged to 'next' on 2018-06-19\n\n Code cleanup.\n\n Will merge to 'master'.\n\n\n* ab/checkout-default-remote (2018-06-11) 8 commits\n - checkout & worktree: introduce checkout.defaultRemote\n - checkout: add advice for ambiguous \"checkout <branch>\"\n - builtin/checkout.c: use \"ret\" variable for return\n - checkout: pass the \"num_matches\" up to callers\n - checkout.c: change \"unique\" member to \"num_matches\"\n - checkout.c: introduce an *_INIT macro\n - checkout.h: wrap the arguments to unique_tracking_name()\n - checkout tests: index should be clean after dwim checkout\n\n\n* ds/commit-graph-fsck (2018-06-27) 22 commits\n - commit-graph: update design document\n - gc: automatically write commit-graph files\n - commit-graph: add '--reachable' option\n - commit-graph: use string-list API for input\n - fsck: verify commit-graph\n - commit-graph: verify contents match checksum\n - commit-graph: test for corrupted octopus edge\n - commit-graph: verify commit date\n - commit-graph: verify generation number\n - commit-graph: verify parent list\n - commit-graph: verify root tree OIDs\n - commit-graph: verify objects exist\n - commit-graph: verify corrupt OID fanout and lookup\n - commit-graph: verify required chunks are present\n - commit-graph: verify catches corrupt signature\n - commit-graph: add 'verify' subcommand\n - commit-graph: load a root tree from specific graph\n - commit: force commit to parse from object database\n - commit-graph: parse commit from chosen graph\n - commit-graph: fix GRAPH_MIN_SIZE\n - commit-graph: UNLEAK before die()\n - t5318-commit-graph.sh: use core.commitGraph\n\n \"git fsck\" learns to make sure the optional commit-graph file is in\n a sane state.\n\n Is this ready for 'next'?\n\n\n* ma/wrapped-info (2018-05-28) 2 commits\n - usage: prefix all lines in `vreportf()`, not just the first\n - usage: extract `prefix_suffix_lines()` from `advise()`\n\n An attempt to help making multi-line messages fed to warning(),\n error(), and friends more easily translatable.\n\n Will discard and wait for a cleaned-up rewrite.\n cf. <20180529213957.GF7964@sigill.intra.peff.net>\n\n\n* jm/cache-entry-from-mem-pool (2018-06-28) 8 commits\n - block alloc: add validations around cache_entry lifecyle\n - block alloc: allocate cache entries from mem-pool\n - mem-pool: fill out functionality\n - mem-pool: add life cycle management functions\n - mem-pool: only search head block for available space\n - block alloc: add lifecycle APIs for cache_entry structs\n - read-cache: make_cache_entry should take object_id struct\n - read-cache: teach refresh_cache_entry() to take istate\n\n For a large tree, the index needs to hold many cache entries\n allocated on heap.  These cache entries are now allocated out of a\n dedicated memory pool to amortize malloc(3) overhead.\n\n\n* sb/object-store-grafts (2018-05-18) 19 commits\n  (merged to 'next' on 2018-06-28 at 02f70d6302)\n + commit: allow lookup_commit_graft to handle arbitrary repositories\n + commit: allow prepare_commit_graft to handle arbitrary repositories\n + shallow: migrate shallow information into the object parser\n + path.c: migrate global git_path_* to take a repository argument\n + cache: convert get_graft_file to handle arbitrary repositories\n + commit: convert read_graft_file to handle arbitrary repositories\n + commit: convert register_commit_graft to handle arbitrary repositories\n + commit: convert commit_graft_pos() to handle arbitrary repositories\n + shallow: add repository argument to is_repository_shallow\n + shallow: add repository argument to check_shallow_file_for_update\n + shallow: add repository argument to register_shallow\n + shallow: add repository argument to set_alternate_shallow_file\n + commit: add repository argument to lookup_commit_graft\n + commit: add repository argument to prepare_commit_graft\n + commit: add repository argument to read_graft_file\n + commit: add repository argument to register_commit_graft\n + commit: add repository argument to commit_graft_pos\n + object: move grafts to object parser\n + object-store: move object access functions to object-store.h\n\n Originally merged to 'next' on 2018-06-22\n\n The conversion to pass \"the_repository\" and then \"a_repository\"\n throughout the object access API continues.\n\n Will merge to 'master'.\n\n\n* js/branch-diff (2018-05-16) 19 commits\n - fixup! Add a function to solve least-cost assignment problems\n - completion: support branch-diff\n - branch-diff: add a man page\n - branch-diff --dual-color: work around bogus white-space warning\n - branch-diff: offer to dual-color the diffs\n - diff: add an internal option to dual-color diffs of diffs\n - color: provide inverted colors, too\n - branch-diff: use color for the commit pairs\n - branch-diff: add tests\n - branch-diff: do not show \"function names\" in hunk headers\n - branch-diff: adjust the output of the commit pairs\n - branch-diff: suppress the diff headers\n - branch-diff: indent the diffs just like tbdiff\n - branch-diff: right-trim commit messages\n - branch-diff: also show the diff between patches\n - branch-diff: improve the order of the shown commits\n - branch-diff: first rudimentary implementation\n - Add a new builtin: branch-diff\n - Add a function to solve least-cost assignment problems\n\n \"git tbdiff\" that lets us compare individual patches in two\n iterations of a topic has been rewritten and made into a built-in\n command.\n\n Expecting a reroll.\n cf. <nycvar.QRO.7.76.6.1805052351560.77@tvgsbejvaqbjf.bet>\n\n\n* sb/diff-color-move-more (2018-06-25) 11 commits\n - diff: fix a sparse 'dubious one-bit signed bitfield' error\n - SQUASH??? t/4015 GETTEXT_POISON emergency fix\n - SQUASH????? Documentation breakage emergency fix\n - diff.c: add white space mode to move detection that allows indent changes\n - diff.c: factor advance_or_nullify out of mark_color_as_moved\n - diff.c: decouple white space treatment from move detection algorithm\n - diff.c: add a blocks mode for moved code detection\n - diff.c: adjust hash function signature to match hashmap expectation\n - diff.c: do not pass diff options as keydata to hashmap\n - xdiff/xdiffi.c: remove unneeded function declarations\n - xdiff/xdiff.h: remove unused flags\n\n \"git diff --color-moved\" feature has further been tweaked.\n\n Needs to be cleaned-up with various fix-up bits applied inline.\n\n\n* jk/branch-l-0-deprecation (2018-06-22) 3 commits\n - branch: deprecate \"-l\" option\n - t: switch \"branch -l\" to \"branch --create-reflog\"\n - t3200: unset core.logallrefupdates when testing reflog creation\n (this branch is used by jk/branch-l-1-repurpose.)\n\n The \"-l\" option in \"git branch -l\" is an unfortunate short-hand for\n \"--create-reflog\", but many users, both old and new, somehow expect\n it to be something else, perhaps \"--list\".  This step warns when \"-l\"\n is used as a short-hand for \"--create-reflog\" and warns about the\n future repurposing of the it when it is used.\n\n Will merge to 'next'.\n"},{"id":"351274","messageId":"CAGZ79kbKrDu8iW+867c73OMhgqEYA1H3-zQpejxq5jMMNRb2Bg@mail.gmail.com","threadId":"48798","inReplyTo":"xmqqd0wawpwy.fsf@gitster-ct.c.googlers.com","subject":"Re: What's cooking in git.git (Jun 2018, #07; Thu, 28)","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2018-06-28T22:42:57Z","receivedAt":"2018-06-28T22:43:13Z","isPatch":false,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"On Thu, Jun 28, 2018 at 2:40 PM Junio C Hamano <gitster@pobox.com> wrote:\n> The tip of 'next' has been rewound and it currently has only 4\n> topics.  Quite a many topics are cooking in 'pu' and need to be\n> sifted into good bins (for 'next') and the remainder.  Help is\n> appreciated in that area ;-)\n\nWhich branches are needing review most? Or should I start\ncommenting on random stuff? ;-)\n\n>\n> * bw/ref-in-want (2018-06-28) 8 commits\n>  - fetch-pack: implement ref-in-want\n>  - fetch-pack: put shallow info in output parameter\n>  - fetch: refactor to make function args narrower\n>  - fetch: refactor fetch_refs into two functions\n>  - fetch: refactor the population of peer ref OIDs\n>  - upload-pack: test negotiation with changing repository\n>  - upload-pack: implement ref-in-want\n>  - test-pkt-line: add unpack-sideband subcommand\n>\n>  Protocol v2 has been updated to allow slightly out-of-sync set of\n>  servers to work together to serve a single client, which would be\n>  useful with load-balanced servers that talk smart HTTP transport.\n>\n\nI think another selling point, which should be emphasized more is\nthe ease of ACL checking on the server side.\nEven when the read permissions are per repository (e.g. githubs\nmodel AFAICT), the serving side still has to do a lookup \"Can\na wanted sha1 be reached from all refs?\", which now can be\noptimized away (\"Can I access the master branch?\") and it\nis cheaper to run the server.\nSpecifically if read permissions are per ref (Gerrits model), I'd\nexpect some CPU savings on the serving side.\n\n> * jt/remove-pack-bitmap-global (2018-06-21) 2 commits\n>  - pack-bitmap: add free function\n>  - pack-bitmap: remove bitmap_git global variable\n>\n>  The effort to move globals to per-repository in-core structure\n>  continues.\n\nThis is mostly done, though Peff seems to expect a reroll with\nclarification on how the series is structured?\nhttps://public-inbox.org/git/20180611211033.GB26235@sigill.intra.peff.net/\n\n> * sb/submodule-move-head-error-msg (2018-06-25) 1 commit\n>  - submodule.c: report the submodule that an error occurs in\n>\n>  Needs a reroll.\n>  cf. <20180622081713.5360-1-szeder.dev@gmail.com>\n\nhttps://public-inbox.org/git/xmqqmuviq2n7.fsf@gitster-ct.c.googlers.com/\n\nsuggests that you applied that change and a reroll would not be needed.\n\n\n>\n> * ds/multi-pack-index (2018-06-25) 24 commits\n>  - midx: clear midx on repack\n>  - packfile: skip loading index if in multi-pack-index\n>  - midx: prevent duplicate packfile loads\n>  - midx: use midx in approximate_object_count\n>  - midx: use existing midx when writing new one\n>  - midx: use midx in abbreviation calculations\n>  - midx: read objects from multi-pack-index\n>  - midx: prepare midxed_git struct\n>  - config: create core.multiPackIndex setting\n>  - midx: write object offsets\n>  - midx: write object id fanout chunk\n>  - midx: write object ids in a chunk\n>  - midx: sort and deduplicate objects from packfiles\n>  - midx: read pack names into array\n>  - multi-pack-index: write pack names in chunk\n>  - multi-pack-index: read packfile list\n>  - packfile: generalize pack directory list\n>  - multi-pack-index: expand test data\n>  - multi-pack-index: load into memory\n>  - midx: write header information to lockfile\n>  - multi-pack-index: add 'write' verb\n>  - multi-pack-index: add builtin\n>  - multi-pack-index: add format details\n>  - multi-pack-index: add design document\n>\n>  When there are too many packfiles in a repository (which is not\n>  recommended), looking up an object in these would require\n>  consulting many pack .idx files; a new mechanism to have a single\n>  file that consolidates all of these .idx files is introduced.\n>\n>\n> * nd/use-the-index-compat-less (2018-06-25) 13 commits\n>  - wt-status.c: stop using index compat macros\n>  - sha1-name.c: stop using index compat macros\n>  - sequencer.c: stop using index compat macros\n>  - revision.c: stop using index compat macros\n>  - rerere.c: stop using index compat macros\n>  - merge.c: stop using index compat macros\n>  - merge-recursive.c: stop using index compat macros\n>  - entry.c: stop using index compat macros\n>  - diff.c: stop using index compat macros\n>  - diff-lib.c: stop using index compat macros\n>  - check-racy.c: stop using index compat macros\n>  - blame.c: stop using index compat macros\n>  - apply.c: stop using index compat macros\n>\n>  Use of many convenience functions that operate on the_index\n>  \"primary in-core index instance\" have been rewritten to explicitly\n>  call the coutnerpart functions that take arbitrary index_state and\n>  pass the_index.\n>\n>  I'd say that alone is a useless code churn, but people seem to be\n>  excited about the change, so it is queued here.\n\nAs someone who also does lots of refactoring lately, I am excited\nto see the code health moving in the right direction.\n\nIt is easy to quantify how often we are bitten by code churn\n(that you call useless here); and very hard to quantify bugs\nintroduced or features not written/upstreamed due to clunky\nAPI (as we don't see those or do not attribute a bug to a bad API).\nSo we are naturally biased towards seeing code churn\nas bad, as the signals favor one over the other.\n\n>\n> * jt/fetch-pack-negotiator (2018-06-15) 7 commits\n>  - fetch-pack: introduce negotiator API\n>  - fetch-pack: move common check and marking together\n>  - fetch-pack: make negotiation-related vars local\n>  - fetch-pack: use ref adv. to prune \"have\" sent\n>  - fetch-pack: directly end negotiation if ACK ready\n>  - fetch-pack: clear marks before re-marking\n>  - fetch-pack: split up everything_local()\n>  (this branch is used by jt/fetch-nego-tip.)\n>\n>  Code restructuring and a small fix to transport protocol v2 during\n>  fetching.\n>\n>  Is this ready for 'next'?\n\nThat is a good topic to review for me, I'll jump on it.\n\n> * ds/commit-graph-fsck (2018-06-27) 22 commits\n[...]\n>\n>  \"git fsck\" learns to make sure the optional commit-graph file is in\n>  a sane state.\n>\n>  Is this ready for 'next'?\n\nI hope so, as I plan to reroll the next object store series based\non it. I'll also review that.\n\n>\n> * jm/cache-entry-from-mem-pool (2018-06-28) 8 commits\n>  - block alloc: add validations around cache_entry lifecyle\n>  - block alloc: allocate cache entries from mem-pool\n>  - mem-pool: fill out functionality\n>  - mem-pool: add life cycle management functions\n>  - mem-pool: only search head block for available space\n>  - block alloc: add lifecycle APIs for cache_entry structs\n>  - read-cache: make_cache_entry should take object_id struct\n>  - read-cache: teach refresh_cache_entry() to take istate\n>\n>  For a large tree, the index needs to hold many cache entries\n>  allocated on heap.  These cache entries are now allocated out of a\n>  dedicated memory pool to amortize malloc(3) overhead.\n\nThis is also on my review todo list, still.\n\n>\n> * sb/diff-color-move-more (2018-06-25) 11 commits\n>  - diff: fix a sparse 'dubious one-bit signed bitfield' error\n>  - SQUASH??? t/4015 GETTEXT_POISON emergency fix\n>  - SQUASH????? Documentation breakage emergency fix\n[...]\n>\n>  \"git diff --color-moved\" feature has further been tweaked.\n>\n>  Needs to be cleaned-up with various fix-up bits applied inline.\n\nI'll resend with those squashes and another (test-)fix SZEDER\nmentioned soon.\n\nThanks,\nStefan\n"},{"id":"351327","messageId":"56fc2859-6fb9-62c5-f327-26efae0f38fe@gmail.com","threadId":"48798","inReplyTo":"xmqqd0wawpwy.fsf@gitster-ct.c.googlers.com","subject":"ag/rebase-i-append-todo-help, was Re: What's cooking in git.git (Jun 2018, #07; Thu, 28)","fromName":"Alban Gruin","fromEmail":"alban.gruin@gmail.com","sentAt":"2018-06-29T11:10:17Z","receivedAt":"2018-06-29T11:10:44Z","isPatch":false,"sender":{"key":"alban.gruin@gmail.com","avatar":"https://avatars.githubusercontent.com/u/6310153?v=4"},"body":"Hi Junio,\n\nLe 28/06/2018 à 23:40, Junio C Hamano a écrit :\n> * ag/rebase-i-append-todo-help (2018-06-14) 2 commits\n>  - rebase--interactive: rewrite append_todo_help() in C\n>  - Merge branch 'ag/rebase-p' into ag/rebase-i-append-todo-help\n>  (this branch is used by ag/rebase-i-rewrite-todo.)\n> \n>  Stepwise rewriting of the machinery of \"rebase -i\" into C continues.\n> \n>  Needs a reroll.\n>  cf. <nycvar.QRO.7.76.6.1806261125330.21419@tvgsbejvaqbjf.bet>\n> \n> \nAs I moved append_todo_help() to `rebase-interactive.c`, it should be\nbecause I did not changed `msg = _(…)` to `msg = N_(…)`.\n\nIt was pointed out on IRC that it was not necessary, after all[0].\nBasically, N_() is needed for static variables, not for \"dynamic\"\nvariables like `msg` in append_todo_help().\n\n[0] http://colabti.org/irclogger/irclogger_log/git-devel?date=2018-06-26#l44\n\nCheers,\nAlban\n\n"},{"id":"351334","messageId":"9e583346-2865-231e-04bf-670a36fe1aa7@gmail.com","threadId":"48798","inReplyTo":"CAGZ79kbKrDu8iW+867c73OMhgqEYA1H3-zQpejxq5jMMNRb2Bg@mail.gmail.com","subject":"Re: What's cooking in git.git (Jun 2018, #07; Thu, 28)","fromName":"Derrick Stolee","fromEmail":"stolee@gmail.com","sentAt":"2018-06-29T13:55:51Z","receivedAt":"2018-06-29T13:55:59Z","isPatch":false,"sender":{"key":"stolee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/570044?v=4"},"body":"On 6/28/2018 6:42 PM, Stefan Beller wrote:\n> On Thu, Jun 28, 2018 at 2:40 PM Junio C Hamano <gitster@pobox.com> wrote:\n>\n>> * ds/commit-graph-fsck (2018-06-27) 22 commits\n> [...]\n>>   \"git fsck\" learns to make sure the optional commit-graph file is in\n>>   a sane state.\n>>\n>>   Is this ready for 'next'?\n> I hope so, as I plan to reroll the next object store series based\n> on it. I'll also review that.\n\nI think the series is ready. The only new feedback in a while is your \nstyle comments on \"commit-graph: add '--reachable' option\", which can \nhopefully be squashed in. I'm also open to sending a new series on top \nfor new feedback.\n\nThanks,\n\n-Stolee\n\n\n"},{"id":"351373","messageId":"xmqqk1qhtlqg.fsf@gitster-ct.c.googlers.com","threadId":"48798","inReplyTo":"CAGZ79kbKrDu8iW+867c73OMhgqEYA1H3-zQpejxq5jMMNRb2Bg@mail.gmail.com","subject":"Re: What's cooking in git.git (Jun 2018, #07; Thu, 28)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-06-29T19:51:19Z","receivedAt":"2018-06-29T19:51:25Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Stefan Beller <sbeller@google.com> writes:\n\n>> * jt/remove-pack-bitmap-global (2018-06-21) 2 commits\n>>  - pack-bitmap: add free function\n>>  - pack-bitmap: remove bitmap_git global variable\n>>\n>>  The effort to move globals to per-repository in-core structure\n>>  continues.\n>\n> This is mostly done, though Peff seems to expect a reroll with\n> clarification on how the series is structured?\n> https://public-inbox.org/git/20180611211033.GB26235@sigill.intra.peff.net/\n\nThat one has been resolved by squashing the updated log message in,\nI think, so we should be able to merge it down.\n\n>> * sb/submodule-move-head-error-msg (2018-06-25) 1 commit\n>>  - submodule.c: report the submodule that an error occurs in\n>>\n>>  Needs a reroll.\n>>  cf. <20180622081713.5360-1-szeder.dev@gmail.com>\n>\n> https://public-inbox.org/git/xmqqmuviq2n7.fsf@gitster-ct.c.googlers.com/\n>\n> suggests that you applied that change and a reroll would not be needed.\n\nYup, I forgot about that one.  Thanks.\n\n> It is easy to quantify how often we are bitten by code churn\n> (that you call useless here); and very hard to quantify bugs\n\nBy definition, churn is useless.  Useful ones are refactoring ;-).\n\nAnd when you do want to operate on _the_ single in-core instance,\nnot having to say &the_index in the argument and use $foo_cache()\nfunction does *not* become a source of \"bugs\".  It just saves\ntyping, and turning it to $foo_index(&the_index,...) does *not* make\nit less error prone.\n\n>> * sb/diff-color-move-more (2018-06-25) 11 commits\n>>  - diff: fix a sparse 'dubious one-bit signed bitfield' error\n>>  - SQUASH??? t/4015 GETTEXT_POISON emergency fix\n>>  - SQUASH????? Documentation breakage emergency fix\n> [...]\n>>\n>>  \"git diff --color-moved\" feature has further been tweaked.\n>>\n>>  Needs to be cleaned-up with various fix-up bits applied inline.\n>\n> I'll resend with those squashes and another (test-)fix SZEDER\n> mentioned soon.\n\nThe interdiff of the topic looked alright.  Thanks.\n\n"},{"id":"351378","messageId":"87po09cnir.fsf@evledraar.gmail.com","threadId":"48798","inReplyTo":"xmqqd0wawpwy.fsf@gitster-ct.c.googlers.com","subject":"Re: What's cooking in git.git (Jun 2018, #07; Thu, 28)","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2018-06-29T21:04:44Z","receivedAt":"2018-06-29T21:04:48Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Thu, Jun 28 2018, Junio C Hamano wrote:\n\n> The tip of 'next' has been rewound and it currently has only 4\n> topics.  Quite a many topics are cooking in 'pu' and need to be\n> sifted into good bins (for 'next') and the remainder.  Help is\n> appreciated in that area ;-)\n\nPer my\nhttps://public-inbox.org/git/CACBZZX4yG5h5kk4NFQz_NzAweMa+Nh3H-39OHtcH4XWsA6FGpg@mail.gmail.com/\n(seems to not have been seen) I'd like to suggest that:\n\n[...]\n\n> * ab/fetch-tags-noclobber (2018-05-16) 9 commits\n\nThis be ejected for now.\n\n[...]\n\n> * ab/checkout-default-remote (2018-06-11) 8 commits\n\nAnd this be merged down to \"next\".\n"},{"id":"351606","messageId":"nycvar.QRO.7.76.6.1807031344080.75@tvgsbejvaqbjf.bet","threadId":"48798","inReplyTo":"xmqqd0wawpwy.fsf@gitster-ct.c.googlers.com","subject":"as/safecrlf-quiet-fix, was Re: What's cooking in git.git (Jun 2018, #07; Thu, 28)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-07-03T11:44:35Z","receivedAt":"2018-07-03T11:45:00Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Thu, 28 Jun 2018, Junio C Hamano wrote:\n\n> * as/safecrlf-quiet-fix (2018-06-11) 1 commit\n>   (merged to 'next' on 2018-06-13 at b163674843)\n>  + config.c: fix regression for core.safecrlf false\n> \n>  Fix for 2.17-era regression around `core.safecrlf`.\n\nIs this `maint` material?\n\nCiao,\nDscho\n"},{"id":"351607","messageId":"nycvar.QRO.7.76.6.1807031346320.75@tvgsbejvaqbjf.bet","threadId":"48798","inReplyTo":"xmqqd0wawpwy.fsf@gitster-ct.c.googlers.com","subject":"jh/partial-clone, was Re: What's cooking in git.git (Jun 2018, #07; Thu, 28)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-07-03T11:46:52Z","receivedAt":"2018-07-03T11:47:18Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Thu, 28 Jun 2018, Junio C Hamano wrote:\n\n> * jh/partial-clone (2018-06-12) 1 commit\n>   (merged to 'next' on 2018-06-13 at 818f864b0c)\n>  + list-objects: check if filter is NULL before using\n> \n>  The recent addition of \"partial clone\" experimental feature kicked\n>  in when it shouldn't, namely, when there is no partial-clone filter\n>  defined even if extensions.partialclone is set.\n\nIs this `maint` material?\n\nCiao,\nDscho\n"},{"id":"351608","messageId":"nycvar.QRO.7.76.6.1807031353520.75@tvgsbejvaqbjf.bet","threadId":"48798","inReplyTo":"xmqqd0wawpwy.fsf@gitster-ct.c.googlers.com","subject":"as/sequencer-customizable-comment-char, was Re: What's cooking in git.git (Jun 2018, #07; Thu, 28)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-07-03T11:54:06Z","receivedAt":"2018-07-03T11:54:46Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio & Aaron,\n\nOn Thu, 28 Jun 2018, Junio C Hamano wrote:\n\n> * as/sequencer-customizable-comment-char (2018-06-28) 1 commit\n>  - sequencer: use configured comment character\n> \n>  Honor core.commentchar when preparing the list of commits to replay\n>  in \"rebase -i\".\n\nAs per\nhttps://public-inbox.org/git/nycvar.QRO.7.76.6.1806291607501.74@tvgsbejvaqbjf.bet/\nI am inclined to ask for a \"v2\" (i.e. second iteration of the patch, see\ne.g.\nhttps://github.com/git-for-windows/git/blob/master/CONTRIBUTING.md#submit-the-patch\nwhere it talks about submitting an \"nth version\") that adds an explanation\nto the commit message why the \"auto\" value is handled correctly by this\npatch, as this is not really obvious from reading the diff alone.\n\nAfter that change, I think this is ready for `next`.\n\nCiao,\nDscho\n"},{"id":"351613","messageId":"nycvar.QRO.7.76.6.1807031438240.75@tvgsbejvaqbjf.bet","threadId":"48798","inReplyTo":"xmqqd0wawpwy.fsf@gitster-ct.c.googlers.com","subject":"ag/rebase-i-rewrite-todo, was Re: What's cooking in git.git (Jun 2018, #07; Thu, 28)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-07-03T12:52:32Z","receivedAt":"2018-07-03T12:52:56Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Thu, 28 Jun 2018, Junio C Hamano wrote:\n\n> * ag/rebase-i-rewrite-todo (2018-06-15) 3 commits\n>  - rebase--interactive: rewrite the edit-todo functionality in C\n>  - editor: add a function to launch the sequence editor\n>  - Merge branch 'bc/t3430-fixup' into ag/rebase-i-rewrite-todo\n>  (this branch uses ag/rebase-i-append-todo-help.)\n> \n>  Stepwise rewriting of the machinery of \"rebase -i\" into C continues.\n\nAlban abided by your wish and smooshed those patch series into one honking\nbig one, to grow even further with his ongoing work. I have to admit that\nI am not enthusiastic about this, as it will make it even harder to\nsqueeze in the time for me to review those patches.\n\nThe latest iteration of this is here:\nhttps://public-inbox.org/git/20180702105717.26386-5-alban.gruin@gmail.com/T/#r8eea71077745d6f2c839acb6200bb8b2bea579d3\n\nI would *strongly* encourage you to allow Alban to go back to the small,\nincremental patch series he sent before, because it will make it\n*substantially* easier to not only review, but also develop, and for you\nto merge.\n\nIn this case, for example, the two patches in\nhttps://public-inbox.org/git/20180702105717.26386-4-alban.gruin@gmail.com/\nand\nhttps://public-inbox.org/git/20180702105717.26386-5-alban.gruin@gmail.com/\nare ready to go into `next`, like, right now.\n\nYet because they are now embedded in a larger patch series, they will have\nto be re-rolled over and over again until *all* of\n`git-rebase--interactive.sh` is rewritten in C?  That's really wasteful of\nreviewers' time.\n\nCiao,\nDscho\n"},{"id":"351619","messageId":"nycvar.QRO.7.76.6.1807031504130.75@tvgsbejvaqbjf.bet","threadId":"48798","inReplyTo":"xmqqd0wawpwy.fsf@gitster-ct.c.googlers.com","subject":"js/branch-diff, was Re: What's cooking in git.git (Jun 2018, #07; Thu, 28)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-07-03T13:05:49Z","receivedAt":"2018-07-03T13:06:19Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Thu, 28 Jun 2018, Junio C Hamano wrote:\n\n> * js/branch-diff (2018-05-16) 19 commits\n>  - fixup! Add a function to solve least-cost assignment problems\n>  - completion: support branch-diff\n>  - branch-diff: add a man page\n>  - branch-diff --dual-color: work around bogus white-space warning\n>  - branch-diff: offer to dual-color the diffs\n>  - diff: add an internal option to dual-color diffs of diffs\n>  - color: provide inverted colors, too\n>  - branch-diff: use color for the commit pairs\n>  - branch-diff: add tests\n>  - branch-diff: do not show \"function names\" in hunk headers\n>  - branch-diff: adjust the output of the commit pairs\n>  - branch-diff: suppress the diff headers\n>  - branch-diff: indent the diffs just like tbdiff\n>  - branch-diff: right-trim commit messages\n>  - branch-diff: also show the diff between patches\n>  - branch-diff: improve the order of the shown commits\n>  - branch-diff: first rudimentary implementation\n>  - Add a new builtin: branch-diff\n>  - Add a function to solve least-cost assignment problems\n> \n>  \"git tbdiff\" that lets us compare individual patches in two\n>  iterations of a topic has been rewritten and made into a built-in\n>  command.\n> \n>  Expecting a reroll.\n>  cf. <nycvar.QRO.7.76.6.1805052351560.77@tvgsbejvaqbjf.bet>\n\nI rolled it around so hard that it got dizzy.\n\n(Yes, I just made fun of this Git speak \"to re-roll\".)\n\nSeriously again, I sent a new iteration:\n\n\thttps://public-inbox.org/git/pull.1.v3.git.gitgitgadget@gmail.com/\n\nCiao,\nDscho\n"},{"id":"351631","messageId":"xmqqd0w4ryi1.fsf@gitster-ct.c.googlers.com","threadId":"48798","inReplyTo":"nycvar.QRO.7.76.6.1807031344080.75@tvgsbejvaqbjf.bet","subject":"Re: as/safecrlf-quiet-fix, was Re: What's cooking in git.git (Jun 2018, #07; Thu, 28)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-07-03T17:59:50Z","receivedAt":"2018-07-03T17:59:56Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n\n> Hi Junio,\n>\n> On Thu, 28 Jun 2018, Junio C Hamano wrote:\n>\n>> * as/safecrlf-quiet-fix (2018-06-11) 1 commit\n>>   (merged to 'next' on 2018-06-13 at b163674843)\n>>  + config.c: fix regression for core.safecrlf false\n>> \n>>  Fix for 2.17-era regression around `core.safecrlf`.\n>\n> Is this `maint` material?\n\nPossibly.  Why do you ask?\n\n"},{"id":"351637","messageId":"CABPp-BE=2nzEG=X0Jv3++J3Yo3H0yfJ9vd4pDYYBw5fpzDYc_g@mail.gmail.com","threadId":"48798","inReplyTo":"xmqqd0wawpwy.fsf@gitster-ct.c.googlers.com","subject":"Re: What's cooking in git.git (Jun 2018, #07; Thu, 28)","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2018-07-03T18:30:59Z","receivedAt":"2018-07-03T18:31:04Z","isPatch":false,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"Hi Derrick,\n\nOn Thu, Jun 28, 2018 at 2:40 PM, Junio C Hamano <gitster@pobox.com> wrote:\n> * ds/multi-pack-index (2018-06-25) 24 commits\n>  - midx: clear midx on repack\n>  - packfile: skip loading index if in multi-pack-index\n>  - midx: prevent duplicate packfile loads\n>  - midx: use midx in approximate_object_count\n>  - midx: use existing midx when writing new one\n>  - midx: use midx in abbreviation calculations\n>  - midx: read objects from multi-pack-index\n>  - midx: prepare midxed_git struct\n>  - config: create core.multiPackIndex setting\n>  - midx: write object offsets\n>  - midx: write object id fanout chunk\n>  - midx: write object ids in a chunk\n>  - midx: sort and deduplicate objects from packfiles\n>  - midx: read pack names into array\n>  - multi-pack-index: write pack names in chunk\n>  - multi-pack-index: read packfile list\n>  - packfile: generalize pack directory list\n>  - multi-pack-index: expand test data\n>  - multi-pack-index: load into memory\n>  - midx: write header information to lockfile\n>  - multi-pack-index: add 'write' verb\n>  - multi-pack-index: add builtin\n>  - multi-pack-index: add format details\n>  - multi-pack-index: add design document\n>\n>  When there are too many packfiles in a repository (which is not\n>  recommended), looking up an object in these would require\n>  consulting many pack .idx files; a new mechanism to have a single\n>  file that consolidates all of these .idx files is introduced.\n\npu fails to build for me (with the standard 'make DEVELOPER=1 ...'),\nand it appears to come from this series:\n\nmidx.c:567:15: error: ‘write_midx_pack_lookup’ defined but not used\n[-Werror=unused-function]\n static size_t write_midx_pack_lookup(struct hashfile *f,\n\nIt looks like the use of this function was removed in v2 of your\nseries, but the function itself was left behind?  Could you take a\nlook?\n\nThanks,\nElijah\n"},{"id":"351638","messageId":"CAPig+cQkfFv2+FscnVj3gdLAgeQL8k+vCykES6ZVz-8Uq-nFqA@mail.gmail.com","threadId":"48798","inReplyTo":"CABPp-BE=2nzEG=X0Jv3++J3Yo3H0yfJ9vd4pDYYBw5fpzDYc_g@mail.gmail.com","subject":"Re: What's cooking in git.git (Jun 2018, #07; Thu, 28)","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2018-07-03T18:33:10Z","receivedAt":"2018-07-03T18:33:24Z","isPatch":false,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Tue, Jul 3, 2018 at 2:31 PM Elijah Newren <newren@gmail.com> wrote:\n> On Thu, Jun 28, 2018 at 2:40 PM, Junio C Hamano <gitster@pobox.com> wrote:\n> > * ds/multi-pack-index (2018-06-25) 24 commits\n>\n> pu fails to build for me (with the standard 'make DEVELOPER=1 ...'),\n> and it appears to come from this series:\n>\n> midx.c:567:15: error: ‘write_midx_pack_lookup’ defined but not used\n> [-Werror=unused-function]\n>  static size_t write_midx_pack_lookup(struct hashfile *f,\n>\n> It looks like the use of this function was removed in v2 of your\n> series, but the function itself was left behind?  Could you take a\n> look?\n\nAlso reported here [1].\n\n[1]: https://public-inbox.org/git/CAPig+cRWwTAFRJOwQOi4USk5UZke=2sz_JVDh3+XRKCcBGD5ow@mail.gmail.com/\n"},{"id":"351667","messageId":"xmqq7emcnf37.fsf@gitster-ct.c.googlers.com","threadId":"48798","inReplyTo":"nycvar.QRO.7.76.6.1807031504130.75@tvgsbejvaqbjf.bet","subject":"Re: js/branch-diff, was Re: What's cooking in git.git (Jun 2018, #07; Thu, 28)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-07-03T22:12:44Z","receivedAt":"2018-07-03T22:12:50Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n\n> Seriously again, I sent a new iteration:\n>\n> \thttps://public-inbox.org/git/pull.1.v3.git.gitgitgadget@gmail.com/\n\nThanks, will take a look but it is likely that I'll run out of time\ntoday, so please be a bit patient.\n"},{"id":"351682","messageId":"nycvar.QRO.7.76.6.1807041124330.75@tvgsbejvaqbjf.bet","threadId":"48798","inReplyTo":"xmqqd0w4ryi1.fsf@gitster-ct.c.googlers.com","subject":"Re: as/safecrlf-quiet-fix, was Re: What's cooking in git.git (Jun 2018, #07; Thu, 28)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-07-04T09:25:00Z","receivedAt":"2018-07-04T09:25:24Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Tue, 3 Jul 2018, Junio C Hamano wrote:\n\n> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n> \n> > On Thu, 28 Jun 2018, Junio C Hamano wrote:\n> >\n> >> * as/safecrlf-quiet-fix (2018-06-11) 1 commit\n> >>   (merged to 'next' on 2018-06-13 at b163674843)\n> >>  + config.c: fix regression for core.safecrlf false\n> >> \n> >>  Fix for 2.17-era regression around `core.safecrlf`.\n> >\n> > Is this `maint` material?\n> \n> Possibly.  Why do you ask?\n\nThis is my feeble attempt at helping you triage. My question was more like\na suggestion.\n\nCiao,\nDscho\n"},{"id":"351683","messageId":"nycvar.QRO.7.76.6.1807041125450.75@tvgsbejvaqbjf.bet","threadId":"48798","inReplyTo":"xmqq7emcnf37.fsf@gitster-ct.c.googlers.com","subject":"Re: js/branch-diff, was Re: What's cooking in git.git (Jun 2018, #07; Thu, 28)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-07-04T09:27:34Z","receivedAt":"2018-07-04T09:27:57Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Tue, 3 Jul 2018, Junio C Hamano wrote:\n\n> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n> \n> > Seriously again, I sent a new iteration:\n> >\n> > \thttps://public-inbox.org/git/pull.1.v3.git.gitgitgadget@gmail.com/\n> \n> Thanks, will take a look but it is likely that I'll run out of time\n> today, so please be a bit patient.\n\nSorry, I should have clarified that I do not at all expect reviews to be\nperformed *right now*. It took *me* over a month to get this iteration\nout, after all, and as the changes list suggests: there had been a *ton*\nof changes.\n\nWhile I need the functionality of `range-diff` myself, I'm quite fine over\nhere with my custom build (which I use via an alias from my default\ngit.exe).\n\nCiao,\nDscho\n"},{"id":"351780","messageId":"xmqqtvpcml0w.fsf@gitster-ct.c.googlers.com","threadId":"48798","inReplyTo":"nycvar.QRO.7.76.6.1807041124330.75@tvgsbejvaqbjf.bet","subject":"Re: as/safecrlf-quiet-fix, was Re: What's cooking in git.git (Jun 2018, #07; Thu, 28)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-07-06T15:38:55Z","receivedAt":"2018-07-06T15:39:01Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n\n> On Tue, 3 Jul 2018, Junio C Hamano wrote:\n>\n>> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n>> \n>> > On Thu, 28 Jun 2018, Junio C Hamano wrote:\n>> >\n>> >> * as/safecrlf-quiet-fix (2018-06-11) 1 commit\n>> >>   (merged to 'next' on 2018-06-13 at b163674843)\n>> >>  + config.c: fix regression for core.safecrlf false\n>> >> \n>> >>  Fix for 2.17-era regression around `core.safecrlf`.\n>> >\n>> > Is this `maint` material?\n>> \n>> Possibly.  Why do you ask?\n>\n> This is my feeble attempt at helping you triage. My question was more like\n> a suggestion.\n\nAh, thanks.  That line of suggestion does help, and it would even be\nmore helpful when given before the topic hits 'next' or after\n'master' from the workflow's point of view.\n\nWhile the topic is in 'pu' I can change where the topic forks from,\nand to minimize temptation to stupidly merge an inappropriate topic\n(e.g. new developments and somewhat dubious fixes to commonly used\npart of Git) down to 'maint' during the pre-release freeze\n(i.e. when the tree is otherwise hopefully sleepily quiet and\nboring), I try to base the (beginning of) good 'maint' material on\n'maint' or older, and everything else on the tip of 'master' (or the\nmost recent feature release), when each topic is originally queued\nin my tree.  If I missed a good topic and based it on 'master', it\nis easier to correct such a mistake before it hits 'next', and a\nsuggestion like above would help me tremendously.\n\nAfter the topic hits 'next', its course is pretty much set, until it\ngraduates to 'master'.  About a week or two after such event, I'd go\nthrough \"merge ... later to maint\" entries in the draft release notes\nand if the topic still looked relevant to the maintenance branch,\nmerge them to 'maint'.  Before that happens is another chance to stop\nme from making a stupid mistake, or remind me of an urgent one that\nI've been letting wait in 'master' before merging to 'maint'.\n\nThanks.\n"},{"id":"351785","messageId":"xmqq601smexy.fsf@gitster-ct.c.googlers.com","threadId":"48798","inReplyTo":"nycvar.QRO.7.76.6.1807031438240.75@tvgsbejvaqbjf.bet","subject":"Re: ag/rebase-i-rewrite-todo, was Re: What's cooking in git.git (Jun 2018, #07; Thu, 28)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-07-06T17:50:17Z","receivedAt":"2018-07-06T17:50:24Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n\n> The latest iteration of this is here:\n> https://public-inbox.org/git/20180702105717.26386-5-alban.gruin@gmail.com/T/#r8eea71077745d6f2c839acb6200bb8b2bea579d3\n\nGood.  I think we have it in tree now.\n\n> I would *strongly* encourage you to allow Alban to go back to the small,\n> incremental patch series he sent before, because it will make it\n> *substantially* easier to not only review, but also develop, and for you\n> to merge.\n\nAn organization in which you can make sure that the order of\ndependency and which ones have been updated since previous rounds\nare clear, even to those who are looking from the sidelines (\"these\n4 patches are to replace patch 3, 7 and 8 from the previous round\"\nis already hostile to late reviewers and doing so without a pointer\nto the archive is even worse---a full reroll with the unchanged ones\nmarked below the three-dash lines would be perfect), would be good.\nA random collection of seemingly separate but actually\ninterdependent topics is very hard to work with with limited mental\nbandwidth.\n\nOnce the core of _a_ topic hits 'next', we can go incremental\n(because by definition things get quiet and require small updates by\nthen), but not before.\n\nI think the 7 patches in ag/rebase-i-in-c are more or less in good\nshape, modulo the issues pointed out on the list yet to be\naddressed, which I do not think require redesign.  Which is good.\n\n\n\n"},{"id":"351794","messageId":"nycvar.QRO.7.76.6.1807062117170.75@tvgsbejvaqbjf.bet","threadId":"48798","inReplyTo":"xmqq601smexy.fsf@gitster-ct.c.googlers.com","subject":"Re: ag/rebase-i-rewrite-todo, was Re: What's cooking in git.git (Jun 2018, #07; Thu, 28)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-07-06T19:21:35Z","receivedAt":"2018-07-06T19:22:00Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Fri, 6 Jul 2018, Junio C Hamano wrote:\n\n> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n> \n> > I would *strongly* encourage you to allow Alban to go back to the small,\n> > incremental patch series he sent before, because it will make it\n> > *substantially* easier to not only review, but also develop, and for\n> > you to merge.\n> \n> An organization in which you can make sure that the order of dependency\n> and which ones have been updated since previous rounds are clear, even\n> to those who are looking from the sidelines (\"these 4 patches are to\n> replace patch 3, 7 and 8 from the previous round\" is already hostile to\n> late reviewers and doing so without a pointer to the archive is even\n> worse---a full reroll with the unchanged ones marked below the\n> three-dash lines would be perfect), would be good.  A random collection\n> of seemingly separate but actually interdependent topics is very hard to\n> work with with limited mental bandwidth.\n> \n> Once the core of _a_ topic hits 'next', we can go incremental (because\n> by definition things get quiet and require small updates by then), but\n> not before.\n> \n> I think the 7 patches in ag/rebase-i-in-c are more or less in good\n> shape, modulo the issues pointed out on the list yet to be addressed,\n> which I do not think require redesign.  Which is good.\n\nYou do understand that with your proposed \"let's just roll them up into\none big patch series, and just add freely whatever you need on top\", these\n7 patches (3 of which I reviewed I think four times on the list now, and\nmore times on GitHub, which is quite taxing on my time) will be soon\njoined by 6 more patches: https://github.com/git/git/pull/518\n\nOf course, at that point I will have to look through those 7 patches\nagain, if only to verify that yes, they are still the same.\n\nAnd Alban is not sitting on his hands, either.\n\nSo after reviewing those 13 patches, which undoubtedly will not be\nintegrated into `next` under the premise that they are still in flux, they\nwill most likely be joined by another dozen patches until the interactive\nrebase is rewritten completely in C. After which time, I will have\nreviewed the first 3 patches over 15 times.\n\nI wish there was a better way.\n\nCiao,\nDscho\n"},{"id":"351800","messageId":"xmqqwou8jgp5.fsf@gitster-ct.c.googlers.com","threadId":"48798","inReplyTo":"nycvar.QRO.7.76.6.1807062117170.75@tvgsbejvaqbjf.bet","subject":"Re: ag/rebase-i-rewrite-todo, was Re: What's cooking in git.git (Jun 2018, #07; Thu, 28)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-07-06T19:40:38Z","receivedAt":"2018-07-06T19:40:43Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n\n> Of course, at that point I will have to look through those 7 patches\n> again, if only to verify that yes, they are still the same.\n\nThat is something the patch author must help the reviewer with, no?\n\nHave uncontroversial stuff early in the series, concentrate on\nstabilizing them before moving on to shiny new toys, then mark them\n\"unchanged since the last round\" after three dashes when sending a\nreroll to update later parts of the series that are in flux.  After\na few rounds, it may become apparent to reviewers that these early\nparts can stand on their own merit as a separate series, on top of\nwhich the remaining patches can build as a separate (sub)topic, at\nwhich time we may have two or more topics, among which the early one\nthat has become stable may already be 'next'.\n\n> And Alban is not sitting on his hands, either.\n\nIf you are saying that all of these 13 are constantly in flux,\nwhether these 13 patches are spread across 3 series or a single one\n(assuming that all 13 are about the same topic that are\ninterdependant), the need to look at their updated incarnation does\nnot change, so I do not know what you are complaining about.\n\n> So after reviewing those 13 patches, which undoubtedly will not be\n> integrated into `next` under the premise that they are still in flux, they\n> will most likely be joined by another dozen patches until the interactive\n> rebase is rewritten completely in C. After which time, I will have\n> reviewed the first 3 patches over 15 times.\n>\n> I wish there was a better way.\n\n"},{"id":"351828","messageId":"nycvar.QRO.7.76.6.1807070035210.75@tvgsbejvaqbjf.bet","threadId":"48798","inReplyTo":"xmqqwou8jgp5.fsf@gitster-ct.c.googlers.com","subject":"Re: ag/rebase-i-rewrite-todo, was Re: What's cooking in git.git (Jun 2018, #07; Thu, 28)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-07-06T22:38:09Z","receivedAt":"2018-07-06T22:38:35Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Fri, 6 Jul 2018, Junio C Hamano wrote:\n\n> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n> \n> > Of course, at that point I will have to look through those 7 patches\n> > again, if only to verify that yes, they are still the same.\n> \n> That is something the patch author must help the reviewer with, no?\n> \n> Have uncontroversial stuff early in the series, concentrate on\n> stabilizing them before moving on to shiny new toys, then mark them\n> \"unchanged since the last round\" after three dashes when sending a\n> reroll to update later parts of the series that are in flux.  After\n> a few rounds, it may become apparent to reviewers that these early\n> parts can stand on their own merit as a separate series, on top of\n> which the remaining patches can build as a separate (sub)topic, at\n> which time we may have two or more topics, among which the early one\n> that has become stable may already be 'next'.\n\nOkay, I give up. I tried to show you that I thought that Alban's\npartitioning made sense on its own, that they could (and should) stabilize\nindependently, even if they technically build on one another. In fact, it\nwas I who suggested to keep them in bite-sized patch series. And you\nsimply disagree from your maintaining point of view, and I violently\ndisagree with your decision from the reviewer's point of view.\n\nIn the end, you win.\nDscho\n"},{"id":"351963","messageId":"20180709173131.58704-1-jonathantanmy@google.com","threadId":"48798","inReplyTo":"xmqqd0wawpwy.fsf@gitster-ct.c.googlers.com","subject":"Re: What's cooking in git.git (Jun 2018, #07; Thu, 28)","fromName":"Jonathan Tan","fromEmail":"jonathantanmy@google.com","sentAt":"2018-07-09T17:31:31Z","receivedAt":"2018-07-09T17:31:38Z","isPatch":false,"sender":{"key":"jonathantanmy@fastmail.com","avatar":null},"body":"> * jt/fetch-pack-negotiator (2018-06-15) 7 commits\n>  - fetch-pack: introduce negotiator API\n>  - fetch-pack: move common check and marking together\n>  - fetch-pack: make negotiation-related vars local\n>  - fetch-pack: use ref adv. to prune \"have\" sent\n>  - fetch-pack: directly end negotiation if ACK ready\n>  - fetch-pack: clear marks before re-marking\n>  - fetch-pack: split up everything_local()\n>  (this branch is used by jt/fetch-nego-tip.)\n> \n>  Code restructuring and a small fix to transport protocol v2 during\n>  fetching.\n> \n>  Is this ready for 'next'?\n\nSorry for the late reply - I think that this is ready for \"next\". I have\naddressed all the comments that you, Jonathan Nieder and Brandon\nWilliams have given, and Brandon has given his OK [1].\n\n[1] https://public-inbox.org/git/20180625182434.GE19910@google.com/\n"},{"id":"351972","messageId":"xmqqk1q4e0qf.fsf@gitster-ct.c.googlers.com","threadId":"48798","inReplyTo":"20180709173131.58704-1-jonathantanmy@google.com","subject":"Re: What's cooking in git.git (Jun 2018, #07; Thu, 28)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-07-09T18:13:28Z","receivedAt":"2018-07-09T18:13:33Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonathan Tan <jonathantanmy@google.com> writes:\n\n>> * jt/fetch-pack-negotiator (2018-06-15) 7 commits\n>>  - fetch-pack: introduce negotiator API\n>>  - fetch-pack: move common check and marking together\n>>  - fetch-pack: make negotiation-related vars local\n>>  - fetch-pack: use ref adv. to prune \"have\" sent\n>>  - fetch-pack: directly end negotiation if ACK ready\n>>  - fetch-pack: clear marks before re-marking\n>>  - fetch-pack: split up everything_local()\n>>  (this branch is used by jt/fetch-nego-tip.)\n>> \n>>  Code restructuring and a small fix to transport protocol v2 during\n>>  fetching.\n>> \n>>  Is this ready for 'next'?\n>\n> Sorry for the late reply - I think that this is ready for \"next\". I have\n> addressed all the comments that you, Jonathan Nieder and Brandon\n> Williams have given, and Brandon has given his OK [1].\n>\n> [1] https://public-inbox.org/git/20180625182434.GE19910@google.com/\n\nThanks, I've re-read it over the weekend and agree that we are in a\ngood shape here.\n"}]}