{"thread":{"id":"49522","subject":"What's cooking in git.git (Oct 2018, #01; Wed, 10)","startedAt":"2018-10-10T05:43:55Z","lastAt":"2018-10-16T17:14:15Z","messageCount":34,"participants":["Junio C Hamano","Ævar Arnfjörð Bjarmason","Johannes Schindelin","Phillip Wood","Thomas Gummerer","Jeff King","Michael Witten","Stefan Beller","Tim Schumacher","Johannes Sixt","Derrick Stolee","Duy Nguyen"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"359979","messageId":"xmqq8t36mk4t.fsf@gitster-ct.c.googlers.com","threadId":"49522","inReplyTo":null,"subject":"What's cooking in git.git (Oct 2018, #01; Wed, 10)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-10-10T05:43:46Z","receivedAt":"2018-10-10T05:43:55Z","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\nWe haven't seen much complaints and breakages reported against the\ntwo big \"rewrite in C\" topics around \"rebase\"; perhaps it is a good\ntime to merge them to 'next' soonish to cook them for a few weeks\nbefore moving them to 'master'?\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/fsck-skiplist (2018-09-12) 10 commits\n (merged to 'next' on 2018-09-24 at 26adeb8b8f)\n + fsck: support comments & empty lines in skipList\n + fsck: use oidset instead of oid_array for skipList\n + fsck: use strbuf_getline() to read skiplist file\n + fsck: add a performance test for skipList\n + fsck: add a performance test\n + fsck: document that skipList input must be unabbreviated\n + fsck: document and test commented & empty line skipList input\n + fsck: document and test sorted skipList input\n + fsck tests: add a test for no skipList input\n + fsck tests: setup of bogus commit object\n\n (Originally merged to 'next' on 2018-09-17 at dc9094ba9b)\n\n Update fsck.skipList implementation and documentation.\n\n\n* bc/hash-independent-tests (2018-09-17) 11 commits\n (merged to 'next' on 2018-09-24 at 7c4a61fe46)\n + t5318: use test_oid for HASH_LEN\n + t1407: make hash size independent\n + t1406: make hash-size independent\n + t1405: make hash size independent\n + t1400: switch hard-coded object ID to variable\n + t1006: make hash size independent\n + t0064: make hash size independent\n + t0002: abstract away SHA-1 specific constants\n + t0000: update tests for SHA-256\n + t0000: use hash translation table\n + t: add test functions to translate hash-related values\n\n (Originally merged to 'next' on 2018-09-17 at 9e94794d05)\n\n Various tests have been updated to make it easier to swap the\n hash function used for object identification.\n\n\n* ds/multi-pack-verify (2018-09-17) 11 commits\n (merged to 'next' on 2018-09-24 at f294a34aaf)\n + fsck: verify multi-pack-index\n + multi-pack-index: report progress during 'verify'\n + multi-pack-index: verify object offsets\n + multi-pack-index: fix 32-bit vs 64-bit size check\n + multi-pack-index: verify oid lookup order\n + multi-pack-index: verify oid fanout order\n + multi-pack-index: verify missing pack\n + multi-pack-index: verify packname order\n + multi-pack-index: verify corrupt chunk lookup table\n + multi-pack-index: verify bad header\n + multi-pack-index: add 'verify' verb\n\n (Originally merged to 'next' on 2018-09-17 at f27244f302)\n\n \"git multi-pack-index\" learned to detect corruption in the .midx\n file it uses, and this feature has been integrated into \"git fsck\".\n\n\n* nd/config-split (2018-09-12) 11 commits\n (merged to 'next' on 2018-09-24 at 150cb40d2c)\n + config.txt: move submodule part out to a separate file\n + config.txt: move sequence.editor out of \"core\" part\n + config.txt: move sendemail part out to a separate file\n + config.txt: move receive part out to a separate file\n + config.txt: move push part out to a separate file\n + config.txt: move pull part out to a separate file\n + config.txt: move gui part out to a separate file\n + config.txt: move gitcvs part out to a separate file\n + config.txt: move format part out to a separate file\n + config.txt: move fetch part out to a separate file\n + config.txt: follow camelCase naming\n\n (Originally merged to 'next' on 2018-09-17 at 33e6cb8f48)\n\n Split Documentation/config.txt for easier maintenance.\n\n\n* nd/test-tool (2018-09-11) 6 commits\n (merged to 'next' on 2018-09-24 at 23ad767573)\n + Makefile: add a hint about TEST_BUILTINS_OBJS\n + t/helper: merge test-dump-fsmonitor into test-tool\n + t/helper: merge test-parse-options into test-tool\n + t/helper: merge test-pkt-line into test-tool\n + t/helper: merge test-dump-untracked-cache into test-tool\n + t/helper: keep test-tool command list sorted\n\n (Originally merged to 'next' on 2018-09-17 at decbf86eeb)\n\n Test helper binaries clean-up.\n\n--------------------------------------------------\n[New Topics]\n\n* ds/reachable-final-cleanup (2018-09-25) 1 commit\n - commit-reach: cleanups in can_all_from_reach...\n\n Code already in 'master' is further cleaned-up by this patch.\n\n Will merge to 'next'.\n\n\n* dz/credential-doc-url-matching-rules (2018-09-27) 1 commit\n - doc: clarify gitcredentials path component matching\n\n Doc update.\n\n Will merge to 'next'.\n\n\n* en/status-multiple-renames-to-the-same-target-fix (2018-09-27) 1 commit\n - commit: fix erroneous BUG, 'multiple renames on the same target? how?'\n\n The code in \"git status\" sometimes hit an assertion failure. This\n was caused by a structure that was reused without cleaning the data\n used for the first run, which has been corrected.\n\n Will merge to 'next'.\n\n\n* jc/how-to-document-api (2018-09-29) 1 commit\n - CodingGuidelines: document the API in *.h files\n\n Doc update.\n\n Will merge to 'next'.\n\n\n* jc/rebase-in-c-5-test-typofix (2018-09-28) 1 commit\n - rebase: fix typoes in error messages\n (this branch uses pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts and pk/rebase-in-c-5-test; is tangled with js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)\n\n Typofix.\n\n\n* jc/war-on-string-list (2018-09-28) 1 commit\n - fetch: replace string-list used as a look-up table with a hashmap\n\n Replace two string-list instances used as look-up tables in \"git\n fetch\" with a pair of hashmaps. WIP as there is another such use\n of string-list nearby that should be converted at the same time.\n\n\n* jk/check-everything-connected-is-long-gone (2018-09-25) 1 commit\n - receive-pack: update comment with check_everything_connected\n\n Comment fix.\n\n Will merge to 'next'.\n\n\n* jk/oideq-hasheq-cleanup (2018-10-04) 1 commit\n - more oideq/hasheq conversions\n\n Code clean-up.\n\n Will merge to 'next'.\n\n\n* js/mingw-wants-vista-or-above (2018-10-04) 3 commits\n - mingw: bump the minimum Windows version to Vista\n - mingw: set _WIN32_WINNT explicitly for Git for Windows\n - compat/poll: prepare for targeting Windows Vista\n\n The minimum version of Windows supported by Windows port fo Git is\n now set to Vista.\n\n Will merge to 'next'.\n\n\n* js/rebase-i-break (2018-10-09) 1 commit\n - rebase -i: introduce the 'break' command\n (this branch uses ag/rebase-i-in-c; is tangled with ag/sequencer-reduce-rewriting-todo, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)\n\n \"git rebase -i\" learned a new insn, 'break', that the user can\n insert in the to-do list. Upon hitting it, the command returns\n control back to the user.\n\n Will hold, waiting for the \"rebase-in-c\" and \"rebase-i-in-c\" topics.\n\n\n* js/remote-archive-v2 (2018-09-28) 4 commits\n - archive: allow archive over HTTP(S) with proto v2\n - archive: implement protocol v2 archive command\n - archive: use packet_reader for communications\n - archive: follow test standards around assertions\n\n The original implementation of \"git archive --remote\" more or less\n bypassed the transport layer and did not work over http(s). The\n version 2 of the protocol is defined to allow going over http(s) as\n well as Git native transport.\n\n Will merge to 'next'.\n\n\n* jt/non-blob-lazy-fetch (2018-10-04) 2 commits\n - fetch-pack: exclude blobs when lazy-fetching trees\n - fetch-pack: avoid object flags if no_dependents\n\n A partial clone that is configured to lazily fetch missing objects\n will on-demand issue a \"git fetch\" request to the originating\n repository to fill not-yet-obtained objects. The request has been\n optimized for requesting a tree object (and not the leaf blob\n objects contained in it) by telling the originating repository that\n no blobs are needed.\n\n Will merge to 'next'.\n\n\n* ma/commit-graph-docs (2018-09-27) 4 commits\n - Doc: refer to the \"commit-graph file\" with dash\n - git-commit-graph.txt: refer to \"*commit*-graph file\"\n - git-commit-graph.txt: typeset more in monospace\n - git-commit-graph.txt: fix bullet lists\n\n Doc update.\n\n Will merge to 'next'.\n\n\n* ma/mailing-list-address-in-git-help (2018-09-29) 1 commit\n - git doc: direct bug reporters to mailing list archive\n\n Doc update.\n\n Will merge to 'next'.\n\n\n* ma/t1400-undebug-test (2018-09-28) 1 commit\n - t1400: drop debug `echo` to actually execute `test`\n\n Test fix.\n\n Will merge to 'next'.\n\n\n* ma/t7005-bash-workaround (2018-09-28) 1 commit\n - t7005-editor: quote filename to fix whitespace-issue\n\n Test fix.\n\n Will merge to 'next'.\n\n\n* nd/help-commands-verbose-by-default (2018-10-03) 1 commit\n - help -a: improve and make --verbose default\n\n \"git help -a\" and \"git help -av\" give different pieces of\n information, and generally the \"verbose\" version is more friendly\n to the new users. \"git help -a\" by default now uses the more\n verbose output (with \"--no-verbose\", you can go back to the\n original). Also \"git help -av\" now lists aliases and external\n commands, which it did not used to.\n\n Will merge to 'next'.\n\n\n* nd/packobjectshook-doc-fix (2018-09-29) 1 commit\n - config.txt: correct the note about uploadpack.packObjectsHook\n\n Doc update.\n\n Will merge to 'next'.\n\n\n* pw/diff-color-moved-ws-fix (2018-10-04) 5 commits\n - diff --color-moved: fix a memory leak\n - diff --color-moved-ws: fix another memory leak\n - diff --color-moved-ws: fix a memory leak\n - diff --color-moved-ws: fix out of bounds string access\n - diff --color-moved-ws: fix double free crash\n\n Various fixes to \"diff --color-moved-ws\".\n\n What's the status of this topic?\n\n\n* rs/grep-no-recursive (2018-10-03) 1 commit\n - grep: add -r/--[no-]recursive\n\n Unlike \"grep\", \"git grep\" by default recurses to the whole tree.\n The command learned \"git grep --recursive\" option, so that \"git\n grep --no-recursive\" can serve as a synonym to setting the\n max-depth to 0.\n\n Will merge to 'next'.\n\n\n* rs/oidset-on-khash (2018-10-04) 5 commits\n - oidset: uninline oidset_init()\n - oidset: use khash\n - khash: factor out kh_release_*\n - fetch-pack: load tip_oids eagerly iff needed\n - fetch-pack: factor out is_unmatched_ref()\n\n The oidset API was built on top of the oidmap API which in turn is\n on the hashmap API. Replace the implementation to build on top of\n the khash API and gain performance.\n\n Will merge to 'next'.\n\n\n* rs/sequencer-oidset-insert-avoids-dups (2018-10-03) 1 commit\n - sequencer: use return value of oidset_insert()\n\n Code clean-up.\n\n Will merge to 'next'.\n\n\n* rt/rebase-typofix (2018-09-28) 1 commit\n - git-rebase.sh: fix typos in error messages\n\n Typofix.\n\n Will merge to 'next'.\n\n\n* rv/alias-help (2018-10-03) 3 commits\n - git-help.txt: document \"git help cmd\" vs \"git cmd --help\" for aliases\n - git.c: handle_alias: prepend alias info when first argument is -h\n - help: redirect to aliased commands for \"git cmd --help\"\n\n\n* sb/strbuf-h-update (2018-09-29) 1 commit\n - strbuf.h: format according to coding guidelines\n\n Code clean-up to serve as a BCP example.\n\n What's the status of this one after the discussion thread stopped here?\n cf. \n\n\n* sg/split-index-racefix (2018-09-28) 6 commits\n - split-index: smudge and add racily clean cache entries to split index\n - split-index: don't compare stat data of entries already marked for split index\n - split-index: count the number of deleted entries\n - t1700-split-index: date back files to avoid racy situations\n - split-index: add tests to demonstrate the racy split index problem\n - t1700-split-index: document why FSMONITOR is disabled in this test script\n\n The codepath to support the experimental split-index mode had\n remaining \"racily clean\" issues fixed.\n\n Expecting the final one.\n cf. <20181008154126.GY23446@localhost>\n\n\n* sm/show-superproject-while-conflicted (2018-09-28) 1 commit\n - rev-parse: --show-superproject-working-tree should work during a merge\n\n A corner-case bugfix.\n\n Will merge to 'next'.\n\n\n* ag/sequencer-reduce-rewriting-todo (2018-10-09) 16 commits\n - rebase--interactive: move transform_todo_file() to rebase--interactive.c\n - sequencer: fix a call to error() in transform_todo_file()\n - sequencer: use edit_todo_list() in complete_action()\n - rebase-interactive: rewrite edit_todo_list() to handle the initial edit\n - rebase-interactive: append_todo_help() changes\n - rebase-interactive: use todo_list_transform() in edit_todo_list()\n - sequencer: refactor skip_unnecessary_picks() to work on a todo_list\n - sequencer: change complete_action() to use the refactored functions\n - sequencer: make sequencer_make_script() write its script to a strbuf\n - sequencer: refactor transform_todos() to work on a todo_list\n - sequencer: refactor rearrange_squash() to work on a todo_list\n - sequencer: refactor sequencer_add_exec_commands() to work on a todo_list\n - sequencer: refactor check_todo_list() to work on a todo_list\n - sequencer: make the todo_list structure public\n - sequencer: clear the number of items of a todo_list before parsing\n - Merge branch 'ag/rebase-i-in-c' into ag/sequencer-reduce-rewriting-todo\n (this branch uses ag/rebase-i-in-c; is tangled with js/rebase-i-break, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)\n\n The scripted version of \"git rebase -i\" wrote and rewrote the todo\n list many times during a single step of its operation, and the\n recent C-rewrite made a faithful conversion of the logic to C. The\n implementation has been updated to carry necessary information\n around in-core to avoid rewriting the same file over and over\n unnecessarily.\n\n Will hold, waiting for the \"rebase-in-c\" and \"rebase-i-in-c\" topics.\n\n\n* bc/editorconfig (2018-10-09) 2 commits\n - editorconfig: indicate settings should be kept in sync\n - editorconfig: provide editor settings for Git developers\n\n To help developers, an EditorConfig file that attempts to follow\n the project convention has been added.\n\n Will merge to 'next'.\n\n\n* bc/hash-transition-part-15 (2018-10-09) 14 commits\n - rerere: convert to use the_hash_algo\n - submodule: make zero-oid comparison hash function agnostic\n - apply: rename new_sha1_prefix and old_sha1_prefix\n - apply: replace hard-coded constants\n - tag: express constant in terms of the_hash_algo\n - transport: use parse_oid_hex instead of a constant\n - upload-pack: express constants in terms of the_hash_algo\n - refs/packed-backend: express constants using the_hash_algo\n - packfile: express constants in terms of the_hash_algo\n - pack-revindex: express constants in terms of the_hash_algo\n - builtin/fetch-pack: remove constants with parse_oid_hex\n - builtin/mktree: remove hard-coded constant\n - builtin/repack: replace hard-coded constant\n - pack-bitmap-write: use GIT_MAX_RAWSZ for allocation\n\n\n* ch/subtree-build (2018-10-10) 1 commit\n - subtree: add build targets 'man' and 'html'\n\n Build update for \"git subtree\" (in contrib/) documentation pages.\n\n Will merge to 'next'.\n\n\n* ds/commit-graph-leakfix (2018-10-07) 3 commits\n - commit-graph: reduce initial oid allocation\n - builtin/commit-graph.c: UNLEAK variables\n - commit-graph: clean up leaked memory during write\n (this branch uses ab/commit-graph-progress.)\n\n Code clean-up.\n\n Will merge to 'next'.\n\n\n* ds/test-multi-pack-index (2018-10-09) 3 commits\n - multi-pack-index: define GIT_TEST_MULTI_PACK_INDEX\n - midx: close multi-pack-index on repack\n - midx: fix broken free() in close_midx()\n\n Tests for the recently introduced multi-pack index machinery.\n\n Expecting a reroll.\n cf. <8b5dbe3d-b382-bf48-b524-d9e8a074ac4d@gmail.com>\n\n\n* js/fuzzer (2018-10-10) 2 commits\n - fuzz: add fuzz testing for packfile indices\n - fuzz: add basic fuzz testing target\n\n An experiment to fuzz test a few areas, hopefully we can gain more\n coverage to various areas.\n\n\n* jt/avoid-ls-refs (2018-10-07) 4 commits\n - fetch: do not list refs if fetching only hashes\n - transport: list refs before fetch if necessary\n - transport: do not list refs if possible\n - transport: allow skipping of ref listing\n\n Over some transports, fetching objects with an exact commit object\n name can be done without first seeing the ref advertisements. The\n code has been optimized to exploit this.\n\n Will merge to 'next'.\n\n\n* jt/cache-tree-allow-missing-object-in-partial-clone (2018-10-10) 1 commit\n - cache-tree: skip some blob checks in partial clone\n\n In a partial clone that will lazily be hydrated from the\n originating repository, we generally want to avoid \"does this\n object exist (locally)?\" on objects that we deliberately omitted\n when we created the clone. The cache-tree codepath (which is used\n to write a tree object out of the index) however insisted that the\n object exists, even for paths that are outside of the partial\n checkout area. The code has been updated to avoid such a check.\n\n Will merge to 'next'.\n\n\n* mw/doc-typofixes (2018-10-07) 3 commits\n - docs: typo: s/isimilar/similar/\n - docs: graph: remove unnecessary `graph_update()' call\n - docs: typo: s/go/to/\n\n Typofixes.\n\n Will merge to 'next'.\n\n\n* nd/per-worktree-ref-iteration (2018-10-07) 9 commits\n - SQUASH???\n - reflog expire: cover reflog from all worktrees\n - fsck: check HEAD and reflog from other worktrees\n - fsck: Move fsck_head_link() to get_default_heads() to avoid some globals\n - revision.c: better error reporting on ref from different worktrees\n - revision.c: correct a parameter name\n - refs: new ref types to make per-worktree refs visible to all worktrees\n - Add a place for (not) sharing stuff between worktrees\n - refs.c: indent with tabs, not spaces\n\n What's the status of this topic?\n\n\n* np/log-graph-octopus-fix (2018-10-10) 1 commit\n - log: fix coloring of certain octopus merge shapes\n\n \"git log --graph\" showing an octopus merge sometimes miscounted the\n number of display columns it is consuming to show the merge and its\n parent commits, which has been corrected.\n\n Expecting a clarification.\n cf. \n\n\n* rs/subtree-fixes (2018-10-07) 4 commits\n - subtree: improve decision on merges kept in split\n - subtree: use commits before rejoins for splits\n - subtree: make --ignore-joins pay attention to adds\n - subtree: refactor split of a commit into standalone method\n\n Various subtree fixes.\n\n Will merge to 'next'.\n Unless somebody objects, that is.\n\n\n* sb/grep-submodule-cleanup (2018-10-10) 1 commit\n - builtin/grep.c: remove superfluous submodule code\n\n Code clean-up.\n\n cf. <20181010001037.74709-1-jonathantanmy@google.com>\n\n\n* sf/complete-stash-list (2018-10-07) 1 commit\n - git-completion.bash: add completion for stash list\n\n The completion script (in contrib/) lerned to complete a handful of\n options \"git stash list\" command takes.\n\n Will merge to 'next'.\n\n\n* tb/filter-alternate-refs (2018-10-09) 4 commits\n - transport.c: introduce core.alternateRefsPrefixes\n - transport.c: introduce core.alternateRefsCommand\n - transport.c: extract 'fill_alternate_refs_command'\n - transport: drop refnames from for_each_alternate_ref\n\n When pushing into a repository that borrows its objects from an\n alternate object store, \"git receive-pack\" that responds to the\n push request on the other side lists the tips of refs in the\n alternate to reduce the amount of objects transferred. This\n sometimes is detrimental when the number of refs in the alternate\n is absurdly large, in which case the bandwidth saved in potentially\n fewer objects transferred is wasted in excessively large ref\n advertisement. The alternate refs that are advertised are now\n configurable with a pair of configuration variables.\n\n Will merge to 'next'.\n\n--------------------------------------------------\n[Stalled]\n\n* bw/submodule-name-to-dir (2018-08-10) 2 commits\n - submodule: munge paths to submodule git directories\n - submodule: create helper to build paths to submodule gitdirs\n\n In modern repository layout, the real body of a cloned submodule\n repository is held in .git/modules/ of the superproject, indexed by\n the submodule name. URLencode the submodule name before computing\n the name of the directory to make sure they form a flat namespace.\n\n Kicked back to 'pu', expecting further work on the topic.\n cf. \n\n\n* ng/status-i-short-for-ignored (2018-08-09) 1 commit\n - status: -i shorthand for --ignored command line option\n\n \"git status --ignored\" gained a shorthand \"git status -i\".\n\n Will discard, after hearing no strong support.\n What's the list opinion on this one? It is Meh to me, but\n obviously the author cared enough to write a patch, so...\n\n\n* sb/submodule-move-head-with-corruption (2018-08-28) 2 commits\n - submodule.c: warn about missing submodule git directories\n - t2013: add test for missing but active submodule\n\n Will discard and wait for a cleaned-up rewrite.\n cf. <20180907195349.GA103699@aiede.svl.corp.google.com>\n\n\n* sl/commit-dry-run-with-short-output-fix (2018-07-30) 4 commits\n . commit: fix exit code when doing a dry run\n . wt-status: teach wt_status_collect about merges in progress\n . wt-status: rename commitable to committable\n . t7501: add coverage for flags which imply dry runs\n\n \"git commit --dry-run\" gave a correct exit status even during a\n conflict resolution toward a merge, but it did not with the\n \"--short\" option, which has been corrected.\n\n Seems to break 7512, 3404 and 7060 in 'pu'.\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* hn/bisect-first-parent (2018-04-21) 1 commit\n - bisect: create 'bisect_flags' parameter in find_bisection()\n (this branch is used by tb/bisect-first-parent.)\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* pb/bisect-helper-2 (2018-07-23) 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* 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* fe/doc-updates (2018-09-21) 3 commits\n (merged to 'next' on 2018-10-10 at 2eea3a88bc)\n + git-describe.1: clarify that \"human readable\" is also git-readable\n + git-column.1: clarify initial description, provide examples\n + git-archimport.1: specify what kind of Arch we're talking about\n\n Doc updates.\n\n Will merge to 'master'.\n\n\n* md/test-cleanup (2018-10-07) 7 commits\n (merged to 'next' on 2018-10-10 at 7e0bf1b573)\n + tests: order arguments to git-rev-list properly\n + t9109: don't swallow Git errors upstream of pipes\n + tests: don't swallow Git errors upstream of pipes\n + t/*: fix ordering of expected/observed arguments\n + tests: standardize pipe placement\n + Documentation: add shell guidelines\n + t/README: reformat Do, Don't, Keep in mind lists\n\n Various test scripts have been updated for style and also correct\n handling of exit status of various commands.\n\n Will merge to 'master'.\n\n\n* nd/complete-fetch-multiple-args (2018-09-21) 1 commit\n (merged to 'next' on 2018-10-10 at f78e14123c)\n + completion: support \"git fetch --multiple\"\n\n Teach bash completion that \"git fetch --multiple\" only takes remote\n names as arguments and no refspecs.\n\n Will merge to 'master'.\n\n\n* jt/fetch-tips-in-partial-clone (2018-09-21) 2 commits\n - fetch: in partial clone, check presence of targets\n - connected: document connectivity in partial clones\n\n \"git fetch $repo $object\" in a partial clone did not correctly\n fetch the asked-for object that is referenced by an object in\n promisor packfile, which has been fixed.\n\n Will merge to 'next'.\n\n\n* tg/t5551-with-curl-7.61.1 (2018-09-24) 2 commits\n (merged to 'next' on 2018-10-10 at 5ada84ed7a)\n + t5551: compare sorted cookies files\n + t5551: move setup code inside test_expect blocks\n\n Test update.\n\n Will merge to 'master'.\n Supersedes tz/t5551-with-curl-7.61.1 topic\n\n\n* jn/gc-auto-prep (2018-07-17) 2 commits\n (merged to 'next' on 2018-10-10 at 4ab6a62f62)\n + gc: exit with status 128 on failure\n + gc: improve handling of errors reading gc.log\n (this branch is used by jn/gc-auto.)\n\n Code clean-up.\n\n Will merge to 'master'.\n\n\n* nd/status-refresh-progress (2018-09-17) 1 commit\n - status: show progress bar if refreshing the index takes too long\n\n \"git status\" learns to show progress bar when refreshing the index\n takes a long time.\n\n Will merge to 'next'.\n\n\n* nd/the-index (2018-09-21) 23 commits\n (merged to 'next' on 2018-10-10 at 16e2e2e947)\n + revision.c: reduce implicit dependency the_repository\n + revision.c: remove implicit dependency on the_index\n + ws.c: remove implicit dependency on the_index\n + tree-diff.c: remove implicit dependency on the_index\n + submodule.c: remove implicit dependency on the_index\n + line-range.c: remove implicit dependency on the_index\n + userdiff.c: remove implicit dependency on the_index\n + rerere.c: remove implicit dependency on the_index\n + sha1-file.c: remove implicit dependency on the_index\n + patch-ids.c: remove implicit dependency on the_index\n + merge.c: remove implicit dependency on the_index\n + merge-blobs.c: remove implicit dependency on the_index\n + ll-merge.c: remove implicit dependency on the_index\n + diff-lib.c: remove implicit dependency on the_index\n + read-cache.c: remove implicit dependency on the_index\n + diff.c: remove implicit dependency on the_index\n + grep.c: remove implicit dependency on the_index\n + diff.c: remove the_index dependency in textconv() functions\n + blame.c: rename \"repo\" argument to \"r\"\n + combine-diff.c: remove implicit dependency on the_index\n + diff.c: reduce implicit dependency on the_index\n + read-cache.c: remove 'const' from index_has_changes()\n + archive.c: remove implicit dependency the_repository\n\n Various codepaths in the core-ish part learn to work on an\n arbitrary in-core index structure, not necessarily the default\n instance \"the_index\".\n\n Will merge to 'master'.\n\n\n* tq/refs-internal-comment-fix (2018-09-17) 1 commit\n (merged to 'next' on 2018-10-09 at 422313bbd0)\n + refs: docstring typo\n\n Fix for typo in a sample code in comment.\n\n Will merge to 'master'.\n\n\n* ts/alias-of-alias (2018-09-17) 3 commits\n (merged to 'next' on 2018-10-09 at ac19b4730b)\n + t0014: introduce an alias testing suite\n + alias: show the call history when an alias is looping\n + alias: add support for aliases of an alias\n\n An alias that expands to another alias has so far been forbidden,\n but now it is allowed to create such an alias.\n\n Will merge to 'master'.\n\n\n* ds/reachable-topo-order (2018-09-21) 7 commits\n - revision.c: refactor basic topo-order logic\n - revision.h: add whitespace in flag definitions\n - commit/revisions: bookkeeping before refactoring\n - revision.c: begin refactoring --topo-order logic\n - test-reach: add rev-list tests\n - test-reach: add run_three_modes method\n - prio-queue: add 'peek' operation\n\n The revision walker machinery learned to take advantage of the\n commit generation numbers stored in the commit-graph file.\n\n What's the status of this topic?\n\n\n* en/merge-cleanup (2018-09-20) 4 commits\n (merged to 'next' on 2018-10-09 at f3a00b506f)\n + merge-recursive: rename merge_file_1() and merge_content()\n + merge-recursive: remove final remaining caller of merge_file_one()\n + merge-recursive: avoid wrapper function when unnecessary and wasteful\n + merge-recursive: set paths correctly when three-way merging content\n\n Code clean-up.\n\n Will merge to 'master'.\n\n\n* jk/delta-islands-with-bitmap-reuse-delta-fix (2018-09-19) 1 commit\n (merged to 'next' on 2018-10-09 at 10e58be2af)\n + pack-objects: handle island check for \"external\" delta base\n\n Fix interactions between two recent topics.\n\n Will merge to 'master'.\n\n\n* jn/mailmap-update (2018-09-25) 1 commit\n (merged to 'next' on 2018-10-10 at fa2b394bd5)\n + mailmap: consistently normalize brian m. carlson's name\n\n The mailmap file update.\n\n Will merge to 'master'.\n\n\n* ma/config-doc-update (2018-09-20) 2 commits\n (merged to 'next' on 2018-10-09 at 312a873a2a)\n + git-config.txt: fix 'see: above' note\n + Doc: use `--type=bool` instead of `--bool`\n\n Doc update.\n\n Will merge to 'master'.\n\n\n* rj/header-check (2018-09-20) 8 commits\n (merged to 'next' on 2018-10-09 at 7fa9c68ef0)\n + delta-islands.h: add missing forward declarations (hdr-check)\n + midx.h: add missing forward declarations (hdr-check)\n + refs/refs-internal.h: add missing declarations (hdr-check)\n + refs/packed-backend.h: add missing declaration (hdr-check)\n + refs/ref-cache.h: add missing declarations (hdr-check)\n + ewah/ewok_rlw.h: add missing include (hdr-check)\n + json-writer.h: add missing include (hdr-check)\n + Makefile: add a hdr-check target\n\n Header files clean-up.\n\n Will merge to 'master'.\n\n\n* bp/read-cache-parallel (2018-09-28) 8 commits\n - read-cache: fix division by zero core-dump\n - read-cache: load cache entries on worker threads\n - ieot: add Index Entry Offset Table (IEOT) extension\n - read-cache: load cache extensions on a worker thread\n - config: add new index.threads config setting\n - eoie: add End of Index Entry (EOIE) extension\n - read-cache: clean up casting and byte decoding\n - read-cache.c: optimize reading index format v4\n\n A new extension to the index file has been introduced, which allows\n the file to be read in parallel.\n\n Will merge to 'next'.\n\n\n* ds/coverage-diff (2018-10-10) 1 commit\n - contrib: add coverage-diff script\n\n The result of coverage test can be combined with \"git blame\" to\n check the test coverage of code introduced recently with a new\n 'coverage-diff' tool (in contrib/).\n\n\n* sb/submodule-recursive-fetch-gets-the-tip (2018-09-12) 9 commits\n - builtin/fetch: check for submodule updates for non branch fetches\n - fetch: retry fetching submodules if sha1 were not fetched\n - submodule: fetch in submodules git directory instead of in worktree\n - submodule.c: do not copy around submodule list\n - submodule: move global changed_submodule_names into fetch submodule struct\n - submodule.c: sort changed_submodule_names before searching it\n - submodule.c: fix indentation\n - sha1-array: provide oid_array_filter\n - string-list: add string_list_{pop, last} functions\n\n \"git fetch --recurse-submodules\" may not fetch the necessary commit\n that is bound to the superproject, which is getting corrected.\n\n Expecting a reroll.\n cf. \n cf. \n cf. \n\n\n* bp/rename-test-env-var (2018-09-28) 6 commits\n - t0000: do not get self-test disrupted by environment warnings\n - preload-index: update GIT_FORCE_PRELOAD_TEST support\n - read-cache: update TEST_GIT_INDEX_VERSION support\n - fsmonitor: update GIT_TEST_FSMONITOR support\n - preload-index: use git_env_bool() not getenv() for customization\n - t/README: correct spelling of \"uncommon\"\n\n Some environment variables that control the runtime options of Git\n used during tests are getting renamed for consistency.\n\n Will merge to 'next'.\n\n\n* ab/commit-graph-progress (2018-09-20) 3 commits\n (merged to 'next' on 2018-09-24 at 76f2f5c1e3)\n + gc: fix regression in 7b0f229222 impacting --quiet\n + commit-graph verify: add progress output\n + commit-graph write: add progress output\n (this branch is used by ds/commit-graph-leakfix.)\n\n (Originally merged to 'next' on 2018-09-20 at 24ca94b1d4)\n\n Generation of (expermental) commit-graph files have so far been\n fairly silent, even though it takes noticeable amount of time in a\n meaningfully large repository. The users will now see progress\n output.\n\n Will merge to 'master'.\n\n\n* ss/wt-status-committable (2018-10-03) 5 commits\n (merged to 'next' on 2018-10-10 at ea30d8819d)\n + roll wt_status_state into wt_status and populate in the collect phase\n + wt-status.c: set the committable flag in the collect phase\n + t7501: add test of \"commit --dry-run --short\"\n + wt-status: rename commitable to committable\n + wt-status.c: move has_unmerged earlier in the file\n (this branch is tangled with jc/wt-status-state-cleanup.)\n\n Code clean-up in the internal machinery used by \"git status\" and\n \"git commit --dry-run\".\n\n Will merge to 'master'.\n\n\n* ds/format-commit-graph-docs (2018-08-21) 2 commits\n - commit-graph.txt: improve formatting for asciidoc\n - Docs: Add commit-graph tech docs to Makefile\n\n Design docs for the commit-graph machinery is now made into HTML as\n well as text.\n\n Will discard.\n I am inclined to drop these, as I do not see much clarity in HTML\n output over the text source. Opinions?\n\n\n* js/rebase-in-c-5.5-work-with-rebase-i-in-c (2018-10-09) 2 commits\n - builtin rebase: prepare for builtin rebase -i\n - Merge branch 'ag/rebase-i-in-c' into js/rebase-in-c-5.5-work-with-rebase-i-in-c\n (this branch is used by pk/rebase-in-c-6-final; uses ag/rebase-i-in-c, pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts and pk/rebase-in-c-5-test; is tangled with ag/sequencer-reduce-rewriting-todo, jc/rebase-in-c-5-test-typofix and js/rebase-i-break.)\n\n \"rebase\" that has been rewritten learns the new calling convention\n used by \"rebase -i\" that was rewritten in C, tying the loose end\n between two GSoC topics that stomped on each other's toes.\n\n\n* js/add-i-coalesce-after-editing-hunk (2018-08-28) 1 commit\n - add -p: coalesce hunks before testing applicability\n\n Applicability check after a patch is edited in a \"git add -i/p\"\n session has been improved.\n\n Will hold.\n cf. \n\n\n* ao/submodule-wo-gitmodules-checked-out (2018-10-09) 10 commits\n - t/helper: add test-submodule-nested-repo-config\n - submodule: support reading .gitmodules when it's not in the working tree\n - submodule: add a helper to check if it is safe to write to .gitmodules\n - t7506: clean up .gitmodules properly before setting up new scenario\n - submodule: use the 'submodule--helper config' command\n - submodule--helper: add a new 'config' subcommand\n - t7411: be nicer to future tests and really clean things up\n - t7411: merge tests 5 and 6\n - submodule: factor out a config_set_in_gitmodules_file_gently function\n - submodule: add a print_config_from_gitmodules() helper\n\n The submodule support has been updated to read from the blob at\n HEAD:.gitmodules when the .gitmodules file is missing from the\n working tree.\n\n\n* md/filter-trees (2018-10-07) 8 commits\n - list-objects-filter: implement filter tree:0\n - list-objects-filter-options: do not over-strbuf_init\n - list-objects-filter: use BUG rather than die\n - revision: mark non-user-given objects instead\n - rev-list: handle missing tree objects properly\n - list-objects: always parse trees gently\n - list-objects: refactor to process_tree_contents\n - list-objects: store common func args in struct\n\n The \"rev-list --filter\" feature learned to exclude all trees via\n \"tree:0\" filter.\n\n Will merge to 'next'.\n\n\n* pk/rebase-in-c-2-basic (2018-09-06) 11 commits\n - builtin rebase: support `git rebase `\n - builtin rebase: only store fully-qualified refs in `options.head_name`\n - builtin rebase: start a new rebase only if none is in progress\n - builtin rebase: support --force-rebase\n - builtin rebase: try to fast forward when possible\n - builtin rebase: require a clean worktree\n - builtin rebase: support the `verbose` and `diffstat` options\n - builtin rebase: support --quiet\n - builtin rebase: handle the pre-rebase hook and --no-verify\n - builtin rebase: support `git rebase --onto A...B`\n - builtin rebase: support --onto\n (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final; uses pk/rebase-in-c.)\n\n\n* pk/rebase-in-c-3-acts (2018-09-06) 7 commits\n - builtin rebase: stop if `git am` is in progress\n - builtin rebase: actions require a rebase in progress\n - builtin rebase: support --edit-todo and --show-current-patch\n - builtin rebase: support --quit\n - builtin rebase: support --abort\n - builtin rebase: support --skip\n - builtin rebase: support --continue\n (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-4-opts, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final; uses pk/rebase-in-c and pk/rebase-in-c-2-basic.)\n\n\n* pk/rebase-in-c-4-opts (2018-09-06) 18 commits\n - builtin rebase: support --root\n - builtin rebase: add support for custom merge strategies\n - builtin rebase: support `fork-point` option\n - merge-base --fork-point: extract libified function\n - builtin rebase: support --rebase-merges[=[no-]rebase-cousins]\n - builtin rebase: support `--allow-empty-message` option\n - builtin rebase: support `--exec`\n - builtin rebase: support `--autostash` option\n - builtin rebase: support `-C` and `--whitespace=`\n - builtin rebase: support `--gpg-sign` option\n - builtin rebase: support `--autosquash`\n - builtin rebase: support `keep-empty` option\n - builtin rebase: support `ignore-date` option\n - builtin rebase: support `ignore-whitespace` option\n - builtin rebase: support --committer-date-is-author-date\n - builtin rebase: support --rerere-autoupdate\n - builtin rebase: support --signoff\n - builtin rebase: allow selecting the rebase \"backend\"\n (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final; uses pk/rebase-in-c, pk/rebase-in-c-2-basic and pk/rebase-in-c-3-acts.)\n\n\n* pk/rebase-in-c-5-test (2018-09-06) 6 commits\n - builtin rebase: error out on incompatible option/mode combinations\n - builtin rebase: use no-op editor when interactive is \"implied\"\n - builtin rebase: show progress when connected to a terminal\n - builtin rebase: fast-forward to onto if it is a proper descendant\n - builtin rebase: optionally pass custom reflogs to reset_head()\n - builtin rebase: optionally auto-detect the upstream\n (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final; uses pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts and pk/rebase-in-c-4-opts.)\n\n\n* pk/rebase-in-c-6-final (2018-10-09) 1 commit\n - rebase: default to using the builtin rebase\n (this branch uses ag/rebase-i-in-c, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts and pk/rebase-in-c-5-test; is tangled with ag/sequencer-reduce-rewriting-todo, jc/rebase-in-c-5-test-typofix and js/rebase-i-break.)\n\n The final step of rewriting \"rebase -i\" in C.\n\n Undecided.\n I've been using this (i.e. the whole \"rebase -i\" and \"rebase\"\n rewritten in C) in my personal build, and I also know users on\n Windows port have been using it with the last feature release. I\n am tempted to merge the whole thing to 'next' soonish.\n\n Opinions? It's the last chance to remove any existing and avoid\n any future \"oops, that was wrong, and here is a fix-up\"\n embarrassment in these topics.\n\n\n* ps/stash-in-c (2018-08-31) 20 commits\n - stash: replace all `write-tree` child processes with API calls\n - stash: optimize `get_untracked_files()` and `check_changes()`\n - stash: convert `stash--helper.c` into `stash.c`\n - stash: convert save to builtin\n - stash: make push -q quiet\n - stash: convert push to builtin\n - stash: convert create to builtin\n - stash: convert store to builtin\n - stash: mention options in `show` synopsis\n - stash: convert show to builtin\n - stash: convert list to builtin\n - stash: convert pop to builtin\n - stash: convert branch to builtin\n - stash: convert drop and clear to builtin\n - stash: convert apply to builtin\n - stash: add tests for `git stash show` config\n - stash: rename test cases to be more descriptive\n - stash: update test cases conform to coding guidelines\n - stash: improve option parsing test coverage\n - sha1-name.c: add `get_oidf()` which acts like `get_oid()`\n\n \"git stash\" rewritten in C.\n\n Undecided. This also has been part of my personal build. I do not\n offhand recall if this also had the same exposure to the end users\n as \"rebase\" and \"rebase -i\". I am tempted to merge this to 'next'\n soonish.\n\n Opinions?\n\n\n* pw/add-p-select (2018-07-26) 4 commits\n - add -p: optimize line selection for short hunks\n - add -p: allow line selection to be inverted\n - add -p: select modified lines correctly\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 Will discard.\n No further feedbacks on the topic for quite some time.\n\n cf. \n I found the feature to be hard to explain, and may result in more\n end-user complaints, but let's see.\n\n\n* ds/commit-graph-with-grafts (2018-08-21) 8 commits\n (merged to 'next' on 2018-10-09 at 851a457102)\n + commit-graph: close_commit_graph before shallow walk\n + commit-graph: not compatible with uninitialized repo\n + commit-graph: not compatible with grafts\n + commit-graph: not compatible with replace objects\n + test-repository: properly init repo\n + commit-graph: update design document\n + refs.c: upgrade for_each_replace_ref to be a each_repo_ref_fn callback\n + refs.c: migrate internal ref iteration to pass thru repository argument\n\n The recently introduced commit-graph auxiliary data is incompatible\n with mechanisms such as replace & grafts that \"breaks\" immutable\n nature of the object reference relationship. Disable optimizations\n based on its use (and updating existing commit-graph) when these\n incompatible features are in use in the repository.\n\n Will merge to 'master'.\n\n\n* jn/gc-auto (2018-07-17) 1 commit\n (merged to 'next' on 2018-10-10 at 9f0f1f770e)\n + gc: do not return error for prior errors in daemonized mode\n (this branch uses jn/gc-auto-prep.)\n\n \"gc --auto\" ended up calling exit(-1) upon error, which has been\n corrected to use exit(1). Also the error reporting behaviour when\n daemonized has been updated to exit with zero status when stopping\n due to a previously discovered error (which implies there is no\n point running gc to improve the situation); we used to exit with\n failure in such a case.\n\n Will merge to 'master'.\n cf. <20180917182639.GB140909@aiede.svl.corp.google.com>\n cf. <20181009234502.oxzfwirjcew2sxrm@dcvr>\n\n\n* ag/rebase-i-in-c (2018-10-09) 20 commits\n - rebase -i: move rebase--helper modes to rebase--interactive\n - rebase -i: remove git-rebase--interactive.sh\n - rebase--interactive2: rewrite the submodes of interactive rebase in C\n - rebase -i: implement the main part of interactive rebase as a builtin\n - rebase -i: rewrite init_basic_state() in C\n - rebase -i: rewrite write_basic_state() in C\n - rebase -i: rewrite the rest of init_revisions_and_shortrevisions() in C\n - rebase -i: implement the logic to initialize $revisions in C\n - rebase -i: remove unused modes and functions\n - rebase -i: rewrite complete_action() in C\n - t3404: todo list with commented-out commands only aborts\n - sequencer: change the way skip_unnecessary_picks() returns its result\n - sequencer: refactor append_todo_help() to write its message to a buffer\n - rebase -i: rewrite checkout_onto() in C\n - rebase -i: rewrite setup_reflog_action() in C\n - sequencer: add a new function to silence a command, except if it fails\n - rebase -i: rewrite the edit-todo functionality in C\n - editor: add a function to launch the sequence editor\n - rebase -i: rewrite append_todo_help() in C\n - sequencer: make three functions and an enum from sequencer.c public\n (this branch is used by ag/sequencer-reduce-rewriting-todo, js/rebase-i-break, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)\n\n Rewrite of the remaining \"rebase -i\" machinery in C.\n\n\n* lt/date-human (2018-07-09) 1 commit\n - Add 'human' date format\n\n A new date format \"--date=human\" that morphs its output depending\n on how far the time is from the current time has been introduced.\n \"--date=auto\" can be used to use this new format when the output is\n goint to the pager or to the terminal and otherwise the default\n format.\n\n\n* pk/rebase-in-c (2018-08-06) 3 commits\n - builtin/rebase: support running \"git rebase \"\n - rebase: refactor common shell functions into their own file\n - rebase: start implementing it as a builtin\n (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final.)\n\n Rewrite of the \"rebase\" machinery in C.\n\n--------------------------------------------------\n[Discarded]\n\n* tz/t5551-with-curl-7.61.1 (2018-09-17) 1 commit\n . t5551-http-fetch-smart.sh: sort cookies before comparing\n\n Test fix.\n\n Discarded to be replaced with tg/t5551-with-curl-7.61.1 topic.\n\n\n* jc/wt-status-state-cleanup (2018-09-07) 1 commit\n . WIP: roll wt_status_state into wt_status and populate in the collect phase\n\n A cleaned-up version appears as a part of ss/wt-status-committable.\n"},{"id":"359980","messageId":"87efcyfd0r.fsf@evledraar.gmail.com","threadId":"49522","inReplyTo":"xmqq8t36mk4t.fsf@gitster-ct.c.googlers.com","subject":"Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2018-10-10T07:59:16Z","receivedAt":"2018-10-10T07:59:22Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Wed, Oct 10 2018, Junio C Hamano wrote:\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\nThere's been no activity on this for 6 months since I sent a \"hey what's\ngoing on with it\" E-Mail in:\nhttps://public-inbox.org/git/20180404204920.GA15402@sigill.intra.peff.net/\n\nMaybe it should just be dropped?\n"},{"id":"360016","messageId":"nycvar.QRO.7.76.6.1810101203571.2034@tvgsbejvaqbjf.bet","threadId":"49522","inReplyTo":"xmqq8t36mk4t.fsf@gitster-ct.c.googlers.com","subject":"builtin stash/rebase, was Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-10-10T12:57:35Z","receivedAt":"2018-10-10T12:57:39Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Wed, 10 Oct 2018, Junio C Hamano wrote:\n\n> We haven't seen much complaints and breakages reported against the\n> two big \"rewrite in C\" topics around \"rebase\"; perhaps it is a good\n> time to merge them to 'next' soonish to cook them for a few weeks\n> before moving them to 'master'?\n\nI would be in favor, as long as the fixup patches I have in Git for\nWindows made it in:\n\nhttps://github.com/git-for-windows/git/commit/6bc7024aecdb1aeb2760c519f7b26e6e5ef21051\n fixup! builtin rebase: support `-C` and `--whitespace=`\n\nhttps://github.com/git-for-windows/git/commit/1e6a1c510ffeae5bb0a4bda7f0528a8213728837\n fixup! builtin rebase: support `--gpg-sign` option\n\nhttps://github.com/git-for-windows/git/commit/ddb6e5ca19d5cdd318bc4bcbb7f7f3fb0892c8cc\n fixup! rebase -i: implement the main part of interactive rebase as a builtin\n\nhttps://github.com/git-for-windows/git/commit/2af24038a95a3879aa0c29d91a43180b9465247e\n fixup! stash: convert apply to builtin\n\nIt seems that Alban picked up the `rebase -i` one, but the other three\nhave not made it into `pu` yet (the two `rebase` ones are really my fault,\nI did not yet find time).\n\nSpeaking about the two `rebase` ones: they are simple fixup! commits,\ncould I trouble you to fetch and cherry-pick them into `pu`, or would you\nprefer if I sent another iteration of `rebase-in-c-4-opts`?\n\nCiao,\nDscho\n"},{"id":"360019","messageId":"nycvar.QRO.7.76.6.1810101502220.2034@tvgsbejvaqbjf.bet","threadId":"49522","inReplyTo":"xmqq8t36mk4t.fsf@gitster-ct.c.googlers.com","subject":"js/mingw-wants-vista-or-above, was Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-10-10T13:04:28Z","receivedAt":"2018-10-10T13:04:32Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Wed, 10 Oct 2018, Junio C Hamano wrote:\n\n> * js/mingw-wants-vista-or-above (2018-10-04) 3 commits\n> - mingw: bump the minimum Windows version to Vista\n> - mingw: set _WIN32_WINNT explicitly for Git for Windows\n> - compat/poll: prepare for targeting Windows Vista\n> \n> The minimum version of Windows supported by Windows port fo Git is\n> now set to Vista.\n> \n> Will merge to 'next'.\n\nCould I ask you to fast-track this to `master`? The code in `master`\nunfortunately no longer compiles in a current Git for Windows SDK, meaning\nthat all of our Continuous Testing fails as long as these patches are not\nmerged.\n\nI do not see how this could affect non-Windows builds, so everybody else\nshould be unaffected anyway.\n\nThanks,\nDscho\n"},{"id":"360020","messageId":"xmqqr2gykkqq.fsf@gitster-ct.c.googlers.com","threadId":"49522","inReplyTo":"nycvar.QRO.7.76.6.1810101502220.2034@tvgsbejvaqbjf.bet","subject":"Re: js/mingw-wants-vista-or-above, was Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-10-10T13:13:33Z","receivedAt":"2018-10-10T13:13:39Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n> Hi Junio,\n>\n> On Wed, 10 Oct 2018, Junio C Hamano wrote:\n>\n>> * js/mingw-wants-vista-or-above (2018-10-04) 3 commits\n>> - mingw: bump the minimum Windows version to Vista\n>> - mingw: set _WIN32_WINNT explicitly for Git for Windows\n>> - compat/poll: prepare for targeting Windows Vista\n>> \n>> The minimum version of Windows supported by Windows port fo Git is\n>> now set to Vista.\n>> \n>> Will merge to 'next'.\n>\n> Could I ask you to fast-track this to `master`? The code in `master`\n> unfortunately no longer compiles in a current Git for Windows SDK, meaning\n> that all of our Continuous Testing fails as long as these patches are not\n> merged.\n\nAbsolutely. There is no point keeping it in 'pu', as nobody would\ntouch it in my tree until it hits 'next' and probably 'master' and\nthe change would get wider exposure to folks to whom it matters in\nyour tree anyway.\n\nThanks for pinging.\n"},{"id":"360021","messageId":"xmqqmurmkkgz.fsf@gitster-ct.c.googlers.com","threadId":"49522","inReplyTo":"nycvar.QRO.7.76.6.1810101203571.2034@tvgsbejvaqbjf.bet","subject":"Re: builtin stash/rebase, was Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-10-10T13:19:24Z","receivedAt":"2018-10-10T13:19:29Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n> Speaking about the two `rebase` ones: they are simple fixup! commits,\n> could I trouble you to fetch and cherry-pick them into `pu`, or would you\n> prefer if I sent another iteration of `rebase-in-c-4-opts`?\n\nIf it were only about me, then the former if I can do my own pace is\neasier. If you promise that you won't complain if a few commits\nlose the amlog notes by accident when such tree mangling is done,\nthat would be even better, but I'd be careful anyway.\n\nI'd rather limit number of changes not seen on the list that come\ninto my tree, so it is likely that I'd parrot these fixup commits or\nresult of \"commit --amend\" to the list if we take that route.\n\nJohannes Schindelin writes:\n\n> Hi Junio,\n>\n> On Wed, 10 Oct 2018, Junio C Hamano wrote:\n>\n>> We haven't seen much complaints and breakages reported against the\n>> two big \"rewrite in C\" topics around \"rebase\"; perhaps it is a good\n>> time to merge them to 'next' soonish to cook them for a few weeks\n>> before moving them to 'master'?\n>\n> I would be in favor, as long as the fixup patches I have in Git for\n> Windows made it in:\n>\n> https://github.com/git-for-windows/git/commit/6bc7024aecdb1aeb2760c519f7b26e6e5ef21051\n> fixup! builtin rebase: support `-C` and `--whitespace=`\n>\n> https://github.com/git-for-windows/git/commit/1e6a1c510ffeae5bb0a4bda7f0528a8213728837\n> fixup! builtin rebase: support `--gpg-sign` option\n>\n> https://github.com/git-for-windows/git/commit/ddb6e5ca19d5cdd318bc4bcbb7f7f3fb0892c8cc\n> fixup! rebase -i: implement the main part of interactive rebase as a builtin\n>\n> https://github.com/git-for-windows/git/commit/2af24038a95a3879aa0c29d91a43180b9465247e\n> fixup! stash: convert apply to builtin\n>\n> It seems that Alban picked up the `rebase -i` one, but the other three\n> have not made it into `pu` yet (the two `rebase` ones are really my fault,\n> I did not yet find time).\n>\n> Speaking about the two `rebase` ones: they are simple fixup! commits,\n> could I trouble you to fetch and cherry-pick them into `pu`, or would you\n> prefer if I sent another iteration of `rebase-in-c-4-opts`?\n>\n> Ciao,\n> Dscho\n"},{"id":"360024","messageId":"42930bb1-502b-b168-be12-92aee526a258@talktalk.net","threadId":"49522","inReplyTo":"xmqq8t36mk4t.fsf@gitster-ct.c.googlers.com","subject":"Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)","fromName":"Phillip Wood","fromEmail":"phillip.wood@talktalk.net","sentAt":"2018-10-10T13:58:39Z","receivedAt":"2018-10-10T13:58:43Z","isPatch":false,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"On 10/10/2018 06:43, Junio C Hamano wrote:\n> 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\n> the integration branches, but I am still holding onto them.\n> \n> * pw/diff-color-moved-ws-fix (2018-10-04) 5 commits\n> - diff --color-moved: fix a memory leak\n> - diff --color-moved-ws: fix another memory leak\n> - diff --color-moved-ws: fix a memory leak\n> - diff --color-moved-ws: fix out of bounds string access\n> - diff --color-moved-ws: fix double free crash\n> \n> Various fixes to \"diff --color-moved-ws\".\n> \n> What's the status of this topic?\n\nI think it is ready for next - Stefan was happy with the last iteration.\n\nBest Wishes\n\nPhillip\n"},{"id":"360027","messageId":"20181010141841.GA17445@hank.intra.tgummerer.com","threadId":"49522","inReplyTo":"xmqq8t36mk4t.fsf@gitster-ct.c.googlers.com","subject":"Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2018-10-10T14:18:41Z","receivedAt":"2018-10-10T14:18:47Z","isPatch":false,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"On 10/10, Junio C Hamano wrote:\n> * ps/stash-in-c (2018-08-31) 20 commits\n> - stash: replace all `write-tree` child processes with API calls\n> - stash: optimize `get_untracked_files()` and `check_changes()`\n> - stash: convert `stash--helper.c` into `stash.c`\n> - stash: convert save to builtin\n> - stash: make push -q quiet\n> - stash: convert push to builtin\n> - stash: convert create to builtin\n> - stash: convert store to builtin\n> - stash: mention options in `show` synopsis\n> - stash: convert show to builtin\n> - stash: convert list to builtin\n> - stash: convert pop to builtin\n> - stash: convert branch to builtin\n> - stash: convert drop and clear to builtin\n> - stash: convert apply to builtin\n> - stash: add tests for `git stash show` config\n> - stash: rename test cases to be more descriptive\n> - stash: update test cases conform to coding guidelines\n> - stash: improve option parsing test coverage\n> - sha1-name.c: add `get_oidf()` which acts like `get_oid()`\n> \n> \"git stash\" rewritten in C.\n> \n> Undecided. This also has been part of my personal build. I do not\n> offhand recall if this also had the same exposure to the end users\n> as \"rebase\" and \"rebase -i\". I am tempted to merge this to 'next'\n> soonish.\n> \n> Opinions?\n\nThere was a v9 of this series [*1*], which hasn't been picked up yet.\nWas that intentional, or an oversight?\n\nI left some comments on that iteration. Some were just style nits,\nbut I think at least [*2*] should be addressed before we merge this\ndown to master, not sure if any of my other comments apply to v8 as\nwell. I'm happy to send fixup patches, or a patches on top of\nthis series for that and my other comments, should they apply to v8,\nor wait for Paul-Sebastian to send a re-roll. What do you prefer?\n\n[*1*]: \n[*2*]: <20180930174848.GE2253@hank.intra.tgummerer.com>\n"},{"id":"360033","messageId":"20181010150658.GA31986@sigill.intra.peff.net","threadId":"49522","inReplyTo":"87efcyfd0r.fsf@evledraar.gmail.com","subject":"Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2018-10-10T15:06:58Z","receivedAt":"2018-10-10T15:07:02Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Oct 10, 2018 at 09:59:16AM +0200, Ævar Arnfjörð Bjarmason wrote:\n\n> \n> On Wed, Oct 10 2018, Junio C Hamano wrote:\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> There's been no activity on this for 6 months since I sent a \"hey what's\n> going on with it\" E-Mail in:\n> https://public-inbox.org/git/20180404204920.GA15402@sigill.intra.peff.net/\n> \n> Maybe it should just be dropped?\n\nThat's fine with me. I think it was a nice cleanup as long as nobody\ncared, but some people did seem to care. Maybe they care less now that\nmore time has passed, but it just hasn't really been worth the time to\nrevisit.\n\nI'm OK to drop it; the patches are on the list if we want to look at it\nagain later.\n\n-Peff\n"},{"id":"360054","messageId":"645452fda0ae411d86487b76aaac8151-mfwitten@gmail.com","threadId":"49522","inReplyTo":"xmqq8t36mk4t.fsf@gitster-ct.c.googlers.com","subject":"`--rebase-merges' still failing badly","fromName":"Michael Witten","fromEmail":"mfwitten@gmail.com","sentAt":null,"receivedAt":"2018-10-10T18:53:22Z","isPatch":false,"sender":{"key":"mfwitten@gmail.com","avatar":"https://avatars.githubusercontent.com/u/597101?v=4"},"body":"On Wed, 10 Oct 2018 14:43:46 +0900, Junio wrote:\n\n> We haven't seen much complaints and breakages reported against the\n> two big \"rewrite in C\" topics around \"rebase\"; perhaps it is a good\n> time to merge them to 'next' soonish to cook them for a few weeks\n> before moving them to 'master'?\n\nIn my opinion, the `--rebase-merges' feature has been broken since the\nbeginning, and the builtin version should be fixed before it is moved\nahead. In short: \"labels\" are brittle; see below for tests.\n\nAlso, here are some quick *additional* thoughts:\n\n * Labels should be simply \"r0\", \"r1\", ... \"rN\".\n\n * The current, long label names are just cumbersome.\n * The embedded comments are already more than enough.\n * \"r\" is short for \"revision\" or \"reset\" or \"remember\", etc.\n * \"r\" is located on a QWERTY keyboard such that it's very\n easy to type \"rN\", where \"N\" is a number.\n\n * Why is the command \"label\" and not \"branch\"? Every other related\n command looks like a normal git command: \"reset\" and \"merge\".\n Make it \"branch\".\n\n * In my experience, there's a lot of this boiler plate:\n\n pick 12345\n label r1\n reset r0\n merge r1\n\n How about instead, use git's existing ideas:\n\n pick 12345\n reset r0\n merge ORIG_HEAD\n\n Or, maybe git in general should treat `-' as `ORIG_HEAD' (which\n would be similar to how `git checkout' understands `-'), thereby\n allowing a very quick idiomatic string of commands:\n\n pick 12345\n reset r0\n merge -\n\n In truth, I don't really know the semantics of `ORIG_HEAD', so\n maybe those should be nailed down and documented more clearly;\n I would like it to work as in the following:\n\n pick 12345\n # label r1 (pretend)\n reset r0 # Store r1 in ORIG_HEAD\n pick 67890 # Do NOT touch ORIG_HEAD\n merge - # Same as merge -C abcde r1\n\n Anyway, this kind of unspoken behavior would make *writing* a\n new history by hand much more pleasant.\n\n * Why not just `--merges' instead of `--rebase-merges'? Or, better\n yet, just make it the default behavior; the special option\n should instead be:\n\n --flatten\n\n This option would simply tell `git rebase' to prepare an initial\n todo list without merges.\n\nThanks for this great feature.\n\nI'm only complaining so much because it's such a useful feature, and I\nwant it to be even better, because I'll probably use it A LOT; it\nshould have been available since the start as a natural consequence of\nthe way git works.\n\nSincerely,\nMichael Witten\n\n---------------\n\nUnfortunately, both the legacy version and the rewrite of\n`--rebase-merges' display a bug that makes this feature fairly\nunusable in practice; it tries to create a \"label\" (i.e., a branch\nname) from a commit log summary line, and the result is often invalid\n(or just plain irritating to work with). In particular, it fails on\ntypical characters, including at least these:\n\n :/\\?.*[]\n\nTo see this, first define some POSIX shell functions:\n\n test()\n {\n (\n set -e\n summary=$1\n d=/tmp/repo ##### WARNING. CHANGE IF NECESSARY.\n rm -rf \"$d\"; mkdir -p \"$d\"; cd \"$d\"\n git init -q\n echo a > a; git add a; git commit -q -m a\n git branch base\n echo b > b; git add b; git commit -q -m b\n git reset -q --hard HEAD^\n git merge -q --no-ff -m \"$summary\" ORIG_HEAD\n git log --graph --oneline\n git rebase --rebase-merges base\n ); status=$?\n echo\n return \"$status\"\n }\n\n Test()\n {\n if test \"$@\" 1>/dev/null 2>&1; then\n echo ' good'; return 0\n else\n echo ' fail'; return 1\n fi\n }\n\nThen, try various commit summaries (see below for results):\n\n test c\n test 'combine these into a merge: a and b'\n Test ab:\n Test a:b\n Test :\n Test a/b\n Test 'Now supports /regex/'\n Test ab/\n Test /ab\n Test /\n Test 'a\\b'\n Test '\\'\n Test 'Maybe this works?'\n Test '?'\n Test 'This does not work.'\n Test 'This works. Strange!'\n Test .git\n Test .\n Test 'Cast each pointer to *void'\n Test '*'\n Test 'return a[1] not a[0]'\n Test '[ does not work'\n Test '['\n Test '] does work'\n Test ']'\n\nHere are the results of pasting the above commands into my terminal:\n\n $ test c\n warning: templates not found in ../install/share/git-core/templates\n * 1992d07 (HEAD -> master) c\n |\\\n | * 34555b5 b\n |/\n * 338db9b (base) a\n Successfully rebased and updated refs/heads/master.\n\n $ test 'combine these into a merge: a and b'\n warning: templates not found in ../install/share/git-core/templates\n * 4202c49 (HEAD -> master) combine these into a merge: a and b\n |\\\n | * 34555b5 b\n |/\n * 338db9b (base) a\n error: refusing to update ref with bad name 'refs/rewritten/combine-these-into-a-merge:-a-and-b'\n hint: Could not execute the todo command\n hint:\n hint: label combine-these-into-a-merge:-a-and-b\n hint:\n hint: It has been rescheduled; To edit the command before continuing, please\n hint: edit the todo list first:\n hint:\n hint: git rebase --edit-todo\n hint: git rebase --continue\n\n $ Test ab:\n fail\n $ Test a:b\n fail\n $ Test :\n fail\n $ Test a/b\n good\n $ Test 'Now supports /regex/'\n fail\n $ Test ab/\n fail\n $ Test /ab\n fail\n $ Test /\n fail\n $ Test 'a\\b'\n fail\n $ Test '\\'\n fail\n $ Test 'Maybe this works?'\n fail\n $ Test '?'\n fail\n $ Test 'This does not work.'\n fail\n $ Test 'This works. Strange!'\n good\n $ Test .git\n fail\n $ Test .\n fail\n $ Test 'Cast each pointer to *void'\n fail\n $ Test '*'\n fail\n $ Test 'return a[1] not a[0]'\n fail\n $ Test '[ does not work'\n fail\n $ Test '['\n fail\n $ Test '] does work'\n good\n $ Test ']'\n good\n"},{"id":"360055","messageId":"CAGZ79kYJGMOtroLhPwOdhWewXf3X_b0QOgiUb65pyJ7xJ-whQw@mail.gmail.com","threadId":"49522","inReplyTo":"xmqq8t36mk4t.fsf@gitster-ct.c.googlers.com","subject":"Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2018-10-10T18:55:51Z","receivedAt":"2018-10-10T18:56:09Z","isPatch":false,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"> * pw/diff-color-moved-ws-fix (2018-10-04) 5 commits\n> - diff --color-moved: fix a memory leak\n> - diff --color-moved-ws: fix another memory leak\n> - diff --color-moved-ws: fix a memory leak\n> - diff --color-moved-ws: fix out of bounds string access\n> - diff --color-moved-ws: fix double free crash\n>\n> Various fixes to \"diff --color-moved-ws\".\n>\n> What's the status of this topic?\n\nPer [1] (\"The whole series is\nReviewed-by: Stefan Beller \"),\nI would suggest merging to 'next'.\n\n[1] https://public-inbox.org/git/CAGZ79kbamUK=d+-ejy9vopDiVZF7OVOngz1Zx9y04VR3HnmoXg@mail.gmail.com/\n\n> * sb/strbuf-h-update (2018-09-29) 1 commit\n> - strbuf.h: format according to coding guidelines\n>\n> Code clean-up to serve as a BCP example.\n>\n> What's the status of this one after the discussion thread stopped here?\n> cf. \n\nI was waiting for more discussion and stricter guidelines,\nwhich never happened.\n\nThe only controversial issue about this patch is whether we want\nto name all parameters or only when we feel like it.\n\nPeff did not seem to care about this particular detail\nhttps://public-inbox.org/git/20180929073827.GD2174@sigill.intra.peff.net/\n\nYou suggested to embrace it further and use caps for the parameter\nnames in the docs comment.\nhttps://public-inbox.org/git/xmqq8t3lb8uu.fsf@gitster-ct.c.googlers.com/\n\nThe patch as-is just adds names everywhere.\nI'd be happy to resend with either\n(a) not enforcing names everywhere, but only as needed or\n(b) having names everywhere, capitalizing them NAMES in\n the doc comment.\n\nI am tempted to ask for\n(c) take as-is, defer the rewording of doc strings for a follow up patch.\n\n> * sb/grep-submodule-cleanup (2018-10-10) 1 commit\n> - builtin/grep.c: remove superfluous submodule code\n>\n> Code clean-up.\n>\n> cf. <20181010001037.74709-1-jonathantanmy@google.com>\n\nWill resend.\n\n\n> * bw/submodule-name-to-dir (2018-08-10) 2 commits\n> - submodule: munge paths to submodule git directories\n> - submodule: create helper to build paths to submodule gitdirs\n>\n> In modern repository layout, the real body of a cloned submodule\n> repository is held in .git/modules/ of the superproject, indexed by\n> the submodule name. URLencode the submodule name before computing\n> the name of the directory to make sure they form a flat namespace.\n>\n> Kicked back to 'pu', expecting further work on the topic.\n> cf. \n\nThanks.\n\n>\n> * sb/submodule-move-head-with-corruption (2018-08-28) 2 commits\n> - submodule.c: warn about missing submodule git directories\n> - t2013: add test for missing but active submodule\n>\n> Will discard and wait for a cleaned-up rewrite.\n> cf. <20180907195349.GA103699@aiede.svl.corp.google.com>\n\nYeah I think discarding this is the right move.\n\n> * sb/submodule-recursive-fetch-gets-the-tip (2018-09-12) 9 commits\n> - builtin/fetch: check for submodule updates for non branch fetches\n> - fetch: retry fetching submodules if sha1 were not fetched\n> - submodule: fetch in submodules git directory instead of in worktree\n> - submodule.c: do not copy around submodule list\n> - submodule: move global changed_submodule_names into fetch submodule struct\n> - submodule.c: sort changed_submodule_names before searching it\n> - submodule.c: fix indentation\n> - sha1-array: provide oid_array_filter\n> - string-list: add string_list_{pop, last} functions\n>\n> \"git fetch --recurse-submodules\" may not fetch the necessary commit\n> that is bound to the superproject, which is getting corrected.\n>\n> Expecting a reroll.\n> cf. \n\nis fixed in\nhttps://public-inbox.org/git/20180917213559.126404-7-sbeller@google.com/\n\n> cf. \n\nThat is fixed locally\n\n> cf. \n\nThat has been addressed via\nhttps://public-inbox.org/git/20180925194755.105578-1-sbeller@google.com/\n\nWill resend after a local review.\n\n> * pk/rebase-in-c-6-final (2018-10-09) 1 commit\n> - rebase: default to using the builtin rebase\n> (this branch uses ag/rebase-i-in-c, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts and pk/rebase-in-c-5-test; is tangled with ag/sequencer-reduce-rewriting-todo, jc/rebase-in-c-5-test-typofix and js/rebase-i-break.)\n>\n> The final step of rewriting \"rebase -i\" in C.\n>\n> Undecided.\n> I've been using this (i.e. the whole \"rebase -i\" and \"rebase\"\n> rewritten in C) in my personal build, and I also know users on\n> Windows port have been using it with the last feature release. I\n> am tempted to merge the whole thing to 'next' soonish.\n>\n> Opinions? It's the last chance to remove any existing and avoid\n> any future \"oops, that was wrong, and here is a fix-up\"\n> embarrassment in these topics.\n\nYes, please merge to next.\n\nStefan\n"},{"id":"360057","messageId":"eba7b565c9d248d1aa930fef4e245a83-mfwitten@gmail.com","threadId":"49522","inReplyTo":"645452fda0ae411d86487b76aaac8151-mfwitten@gmail.com","subject":"Re: `--rebase-merges' still failing badly","fromName":"Michael Witten","fromEmail":"mfwitten@gmail.com","sentAt":null,"receivedAt":"2018-10-10T19:03:32Z","isPatch":false,"sender":{"key":"mfwitten@gmail.com","avatar":"https://avatars.githubusercontent.com/u/597101?v=4"},"body":"On Wed, 10 Oct 2018 18:51:17 -0000, Michael Witten wrote:\n\n> merge - # Same as merge -C abcde r1\n\nThat should be:\n\n merge - # Same as `merge r1'\n"},{"id":"360066","messageId":"9af709dc-6565-da5a-7c4e-0abe730bf18c@gmx.de","threadId":"49522","inReplyTo":"xmqq8t36mk4t.fsf@gitster-ct.c.googlers.com","subject":"Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)","fromName":"Tim Schumacher","fromEmail":"timschumi@gmx.de","sentAt":"2018-10-10T20:38:32Z","receivedAt":"2018-10-10T20:38:31Z","isPatch":false,"sender":{"key":"timschumi@gmx.de","avatar":"https://avatars.githubusercontent.com/u/16820960?v=4"},"body":"On 10.10.18 07:43, Junio C Hamano wrote:\n> * ts/alias-of-alias (2018-09-17) 3 commits\n> (merged to 'next' on 2018-10-09 at ac19b4730b)\n> + t0014: introduce an alias testing suite\n> + alias: show the call history when an alias is looping\n> + alias: add support for aliases of an alias\n>\n> An alias that expands to another alias has so far been forbidden,\n> but now it is allowed to create such an alias.\n>\n> Will merge to 'master'.\nOh well, I still have the changed comment stored locally.\nI guess that has to wait for another time.\n\nAnyways, thanks for pulling this in.\n\nPS: I hope that this E-Mail is formatted correctly. Thunderbird\nreceived an update and now it doesn't show me plain text when\ncomposing an E-Mail.\n"},{"id":"360076","messageId":"3362a7a4-bb03-66a1-0f3f-929fd4b09195@kdbg.org","threadId":"49522","inReplyTo":"xmqq8t36mk4t.fsf@gitster-ct.c.googlers.com","subject":"Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)","fromName":"Johannes Sixt","fromEmail":"j6t@kdbg.org","sentAt":"2018-10-10T21:25:11Z","receivedAt":"2018-10-10T21:25:15Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Am 10.10.18 um 07:43 schrieb Junio C Hamano:\n> We haven't seen much complaints and breakages reported against the\n> two big \"rewrite in C\" topics around \"rebase\"; perhaps it is a good\n> time to merge them to 'next' soonish to cook them for a few weeks\n> before moving them to 'master'?\n\nPlease let me express my sincerest gratitude to Alban, Joel, \nPaul-Sebastian, Pratik, and Dscho. It is such a pleasure to work with \nthe builtin rebase and stash commands on Windows now. I am using them \nsince a month or two, and they work extremely well for me.\n\nThank you all for your hard work!\n\n-- Hannes\n"},{"id":"360105","messageId":"xmqqsh1djtij.fsf@gitster-ct.c.googlers.com","threadId":"49522","inReplyTo":"645452fda0ae411d86487b76aaac8151-mfwitten@gmail.com","subject":"Re: `--rebase-merges' still failing badly","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-10-10T23:01:40Z","receivedAt":"2018-10-10T23:01:46Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Michael Witten writes:\n\n> On Wed, 10 Oct 2018 14:43:46 +0900, Junio wrote:\n>\n>> We haven't seen much complaints and breakages reported against the\n>> two big \"rewrite in C\" topics around \"rebase\"; perhaps it is a good\n>> time to merge them to 'next' soonish to cook them for a few weeks\n>> before moving them to 'master'?\n>\n> In my opinion, the `--rebase-merges' feature has been broken since the\n> beginning, and the builtin version should be fixed before it is moved\n> ahead.\n\nI'll omit the remainder of the message not because I disagree with\nyour suggested improvements to \"rebase-merges\" (that conversation\nshould happen primarily with Dscho), but because I need to react to\nthe above three lines.\n\nIf \"rebase-merges\" has been broken since the beginning, as long as\nthe \"rewrite in C\" topics around \"rebase\" do not make it even worse,\nI do not think it is a good move to block the topics moving forward.\nIf the feature were so broken that it is not practically useful,\nthen people wouldn't be using it in the versions of Git before the\nrewrite, so it won't harm anybody if the same feature in the rewritten\nversion is equally (or even more severely) broken, as long as the\nother parts of the feature works at least equally well compared to\nthe older version.\n\nWe are not in the business of hostage taking.\n\nWhat *should* block the rewrited version is a regression,\ni.e. something that used to work well no longer works or works\ndifferently in such a way that established workflows need to be\nadjusted.\n\nIn any case, suggestions to improve \"rebase-merges\" is a very much\nwelcome thing to be discussed on the list, so thanks for raising the\nissue. What I wanted to say is that I do not think that is a reason\nto keep \"rewrite in C\" waiting in 'pu'.\n\n"},{"id":"360126","messageId":"xmqqpnwhi7m2.fsf@gitster-ct.c.googlers.com","threadId":"49522","inReplyTo":"20181010141841.GA17445@hank.intra.tgummerer.com","subject":"Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-10-11T01:40:05Z","receivedAt":"2018-10-11T01:40:10Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thomas Gummerer writes:\n\n> There was a v9 of this series [*1*], which hasn't been picked up yet.\n> Was that intentional, or an oversight?\n\n;-) Yes, I often miss patches that are buried in other discussions,\nbut this time, it was quite deliberate. I saw comments that pointed\nout at least one thing that needs to be fixed before the series can\nmove forward, so I skipped that iteration, anticipating another\nround of update.\n\nAlso, I was waiting for [*3*] to be answered.\n\n> I left some comments on that iteration. Some were just style nits,\n> but I think at least [*2*] should be addressed before we merge this\n> down to master, not sure if any of my other comments apply to v8 as\n> well. I'm happy to send fixup patches, or a patches on top of\n> this series for that and my other comments, should they apply to v8,\n> or wait for Paul-Sebastian to send a re-roll. What do you prefer?\n\nThe ideal from my point of view is to see responses to your comments\nin the original thread (which is about 1300 messages ago in the list\narchive by now) by Paul-Sebastian, possibly responded by you and/or\nothers, resulting in a concensus on what the right update for the\npatches should be, finally followed by v10, which hopefully would be\nthe final one.\n\n> [*1*]: \n> [*2*]: <20180930174848.GE2253@hank.intra.tgummerer.com>\n\n[*3*] \n"},{"id":"360128","messageId":"xmqqlg75i6zd.fsf@gitster-ct.c.googlers.com","threadId":"49522","inReplyTo":"3362a7a4-bb03-66a1-0f3f-929fd4b09195@kdbg.org","subject":"Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-10-11T01:53:42Z","receivedAt":"2018-10-11T01:53:47Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Sixt writes:\n\n> Am 10.10.18 um 07:43 schrieb Junio C Hamano:\n>> We haven't seen much complaints and breakages reported against the\n>> two big \"rewrite in C\" topics around \"rebase\"; perhaps it is a good\n>> time to merge them to 'next' soonish to cook them for a few weeks\n>> before moving them to 'master'?\n>\n> Please let me express my sincerest gratitude to Alban, Joel,\n> Paul-Sebastian, Pratik, and Dscho. It is such a pleasure to work with\n> the builtin rebase and stash commands on Windows now. I am using them\n> since a month or two, and they work extremely well for me.\n>\n> Thank you all for your hard work!\n\nOK. With another Ack from Dscho, I'd feel safe to merge the\n\"rebase\" topics 'next' and start cooking. \"stash\" seems to be\nalmost there but I think it deserves a chance for a final touch-up\nbefore hitting 'next' (see another thread with Thomas).\n\nThanks.\n"},{"id":"360129","messageId":"xmqqh8hti6xy.fsf@gitster-ct.c.googlers.com","threadId":"49522","inReplyTo":"42930bb1-502b-b168-be12-92aee526a258@talktalk.net","subject":"Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-10-11T01:54:33Z","receivedAt":"2018-10-11T01:54:38Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Phillip Wood writes:\n\n> On 10/10/2018 06:43, Junio C Hamano wrote:\n>> 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\n>> the integration branches, but I am still holding onto them.\n>>\n>> * pw/diff-color-moved-ws-fix (2018-10-04) 5 commits\n>> - diff --color-moved: fix a memory leak\n>> - diff --color-moved-ws: fix another memory leak\n>> - diff --color-moved-ws: fix a memory leak\n>> - diff --color-moved-ws: fix out of bounds string access\n>> - diff --color-moved-ws: fix double free crash\n>>\n>> Various fixes to \"diff --color-moved-ws\".\n>>\n>> What's the status of this topic?\n>\n> I think it is ready for next - Stefan was happy with the last iteration.\n\nThanks.\n"},{"id":"360130","messageId":"xmqqa7nli6np.fsf@gitster-ct.c.googlers.com","threadId":"49522","inReplyTo":"CAGZ79kYJGMOtroLhPwOdhWewXf3X_b0QOgiUb65pyJ7xJ-whQw@mail.gmail.com","subject":"Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-10-11T02:00:42Z","receivedAt":"2018-10-11T02:00:47Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Stefan Beller writes:\n\n>> * pw/diff-color-moved-ws-fix (2018-10-04) 5 commits\n> I would suggest merging to 'next'.\n\nOK.\n\n>> * sb/strbuf-h-update (2018-09-29) 1 commit\n> The patch as-is just adds names everywhere.\n> I'd be happy to resend with either\n> (a) not enforcing names everywhere, but only as needed or\n> (b) having names everywhere, capitalizing them NAMES in\n> the doc comment.\n>\n> I am tempted to ask for\n> (c) take as-is, defer the rewording of doc strings for a follow up patch.\n\nAs long as the planned update eventually comes before all of us\nforget, (c) is fine by me. I'll mark it to be merged to 'next' for\nnow, and follow through that plan, unless somebody else stops me\nbefore it happens.\n\n>> * sb/submodule-recursive-fetch-gets-the-tip (2018-09-12) 9 commits\n> Will resend after a local review.\n\nOK.\n\nThanks for helping me in updating the status for various topics.\n"},{"id":"360133","messageId":"xmqqtvltgra6.fsf@gitster-ct.c.googlers.com","threadId":"49522","inReplyTo":"nycvar.QRO.7.76.6.1810101203571.2034@tvgsbejvaqbjf.bet","subject":"Re: builtin stash/rebase, was Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-10-11T02:18:09Z","receivedAt":"2018-10-11T02:18:14Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n> https://github.com/git-for-windows/git/commit/6bc7024aecdb1aeb2760c519f7b26e6e5ef21051\n> fixup! builtin rebase: support `-C` and `--whitespace=`\n\nFor c7ee2134d4 (rebase-in-c-4-opts); a single liner that is\nobviously correct.\n\n> https://github.com/git-for-windows/git/commit/1e6a1c510ffeae5bb0a4bda7f0528a8213728837\n> fixup! builtin rebase: support `--gpg-sign` option\n\nFor 28a02c5a79 (rebase-in-c-4-opts); the change looks correct (see a\nseparate message).\n\n> https://github.com/git-for-windows/git/commit/ddb6e5ca19d5cdd318bc4bcbb7f7f3fb0892c8cc\n> fixup! rebase -i: implement the main part of interactive rebase as a builtin\n\nYou said Alban already has this in the update, which I took\nyesterday, so I'll ignore this one.\n\n> https://github.com/git-for-windows/git/commit/2af24038a95a3879aa0c29d91a43180b9465247e\n> fixup! stash: convert apply to builtin\n\nI think we are expecting another round of update, so I'll ignore\nthis one for now, too.\n\n> Speaking about the two `rebase` ones: they are simple fixup! commits,\n> could I trouble you to fetch and cherry-pick them into `pu`, or would you\n> prefer if I sent another iteration of `rebase-in-c-4-opts`?\n\nRebuilding 4 will involve rebuilding all the later ones anyway, so\nI'll just try doing it myself and report back if I saw issues.\nThanks.\n\n"},{"id":"360134","messageId":"9a2bd0246038424ab1cdfa68f07cdd4d-mfwitten@gmail.com","threadId":"49522","inReplyTo":"xmqqsh1djtij.fsf@gitster-ct.c.googlers.com","subject":"Re: `--rebase-merges' still failing badly","fromName":"Michael Witten","fromEmail":"mfwitten@gmail.com","sentAt":null,"receivedAt":"2018-10-11T02:48:43Z","isPatch":false,"sender":{"key":"mfwitten@gmail.com","avatar":"https://avatars.githubusercontent.com/u/597101?v=4"},"body":"On Thu, 11 Oct 2018 08:01:40 +0900, Junio wrote:\n\n> Michael Witten writes:\n>\n>> On Wed, 10 Oct 2018 14:43:46 +0900, Junio wrote:\n>>\n>>> We haven't seen much complaints and breakages reported against the\n>>> two big \"rewrite in C\" topics around \"rebase\"; perhaps it is a good\n>>> time to merge them to 'next' soonish to cook them for a few weeks\n>>> before moving them to 'master'?\n>>\n>> In my opinion, the `--rebase-merges' feature has been broken since the\n>> beginning, and the builtin version should be fixed before it is moved\n>> ahead.\n>\n> [...]\n>\n> If \"rebase-merges\" has been broken since the beginning, as long as the\n> \"rewrite in C\" topics around \"rebase\" do not make it even worse, I do\n> not think it is a good move to block the topics moving forward. If the\n> feature were so broken that it is not practically useful, then people\n> wouldn't be using it in the versions of Git before the rewrite, so it\n> won't harm anybody if the same feature in the rewritten version is\n> equally (or even more severely) broken, as long as the other parts of\n> the feature works at least equally well compared to the older version.\n>\n> We are not in the business of hostage taking.\n>\n> What *should* block the rewrited version is a regression, i.e.\n> something that used to work well no longer works or works differently\n> in such a way that established workflows need to be adjusted.\n>\n> [...] I do not think that is a reason to keep \"rewrite in C\" waiting in\n> 'pu'.\n\n* Your logic is appealing, and I nearly pursuaded myself by the same\n reasoning to submit my email as a separate discussion, as you suggest.\n However, what convinced me otherwise is the following:\n\n The closer you move the rewrite to a fast-forward-only public\n branch name, the more likely downstream projects are going to\n set up new, long-lived releases around this very useful but\n nevertheless broken feature.\n\n The moment you announce a new release, there are going to be a bunch of\n people who grab that release and then NEVER look back, and so the rest\n of us will be stuck with this problem for who knows how long.\n\n So, not only is this an appeal to the authors to fix this problem, but\n its also an appeal to you to make sure that the next major release\n includes the fix.\n\n* Also, I say the following without irony or tongue in cheek:\n\n Maybe, no one has complained because few people are using this\n feature yet, or their commit summaries are simplistic, or they've\n got workarounds (as I've got).\n\n Not only must this feature be turned on explicitly, but `git' has\n existed for over a decade *without* it; users who are interested in\n sophisticated management of commit history have already developed other\n ways to achieve the same result (I know I did), or their commit\n messages are so simplistic that the bug is never triggered, or they\n just plan around it by automatically running a quick search/replace for\n the offending characters or for the irritating \"labels\".\n\n If the last decade has shown us anything, it's that git's fundamentals\n are so good that programmers can get around any bug on their own,\n without having to appeal to others for help. And, what is a programmer\n if not someone who is used to making things Just Work [Damnit]?\n\n As an illustration, consider the recent `break' command that is being\n added to the repertoire of `git rebase -i'. Hell, I (and probably many\n others) have been doing that for YEARS with:\n\n x false\n\n No need for a \"new\" command. I bet that 10 years from now, people will\n *still* be using their own ways, and will *still* be totally oblivious\n to the existence of `break'.\n\n That is to say, I wouldn't put much faith in the degree to which people\n report issues. The programming world has a lot of itchy backs, and just\n as many personal inventions for scratching them.\n\nAs always, thanks for taking the time to review everyone's input.\n\nSincerely,\nMichael Witten\n"},{"id":"360174","messageId":"dfa79ba2-0dba-1d74-1a81-543902d20bef@gmail.com","threadId":"49522","inReplyTo":"xmqq8t36mk4t.fsf@gitster-ct.c.googlers.com","subject":"Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)","fromName":"Derrick Stolee","fromEmail":"stolee@gmail.com","sentAt":"2018-10-11T11:16:10Z","receivedAt":"2018-10-11T11:16:15Z","isPatch":false,"sender":{"key":"stolee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/570044?v=4"},"body":"On 10/10/2018 1:43 AM, Junio C Hamano wrote:\n>\n> * ds/reachable-topo-order (2018-09-21) 7 commits\n> - revision.c: refactor basic topo-order logic\n> - revision.h: add whitespace in flag definitions\n> - commit/revisions: bookkeeping before refactoring\n> - revision.c: begin refactoring --topo-order logic\n> - test-reach: add rev-list tests\n> - test-reach: add run_three_modes method\n> - prio-queue: add 'peek' operation\n>\n> The revision walker machinery learned to take advantage of the\n> commit generation numbers stored in the commit-graph file.\n>\n> What's the status of this topic?\nI've reached out for review, especially on the rather large patch \n\"revision.c: refactor basic topo-order logic\" but have received no \nmessages about it. I don't think anyone has even done a cursory style \nreview.\n\nI really think that this is a valuable topic, and it would be nice to \nhave in 2.20, but I'm not pushing to merge something that no one has \nreviewed.\n\n> * ds/format-commit-graph-docs (2018-08-21) 2 commits\n> - commit-graph.txt: improve formatting for asciidoc\n> - Docs: Add commit-graph tech docs to Makefile\n>\n> Design docs for the commit-graph machinery is now made into HTML as\n> well as text.\n>\n> Will discard.\n> I am inclined to drop these, as I do not see much clarity in HTML\n> output over the text source. Opinions?\nThese have been marked for discard for a few weeks. I agree they should \nbe discarded.\n\nThanks,\n-Stolee\n"},{"id":"360240","messageId":"xmqqa7nkf6o4.fsf@gitster-ct.c.googlers.com","threadId":"49522","inReplyTo":"42930bb1-502b-b168-be12-92aee526a258@talktalk.net","subject":"Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-10-11T22:40:59Z","receivedAt":"2018-10-11T22:41:05Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Phillip Wood writes:\n\n> On 10/10/2018 06:43, Junio C Hamano wrote:\n>> 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\n>> the integration branches, but I am still holding onto them.\n>>\n>> * pw/diff-color-moved-ws-fix (2018-10-04) 5 commits\n>> - diff --color-moved: fix a memory leak\n>> - diff --color-moved-ws: fix another memory leak\n>> - diff --color-moved-ws: fix a memory leak\n>> - diff --color-moved-ws: fix out of bounds string access\n>> - diff --color-moved-ws: fix double free crash\n>>\n>> Various fixes to \"diff --color-moved-ws\".\n>>\n>> What's the status of this topic?\n>\n> I think it is ready for next - Stefan was happy with the last iteration.\n\nThis is not about your fixes, but I was skimming the color-moved\nsupport in general as a final sanity check to move this forward and\nnoticed that\n\n\t$ git diff --color-moved-ws=ignore-any master...\n\ndoes not do anything interesting, which is broken at at least two\npoints.\n\n * There is no \"ignore-any\" supported by the feature---I think that\n the parser for the option should have noticed and barfed, but it\n did not. It merely emitted a message to the standard output and\n let it scroll away with the huge diff before the reader noticed\n it.\n\n * After fixing ignore-any to one of the supported option\n (e.g. \"ignore-all-spaces\"), the color-moved feature still did not\n trigger. I think the presence of --color-moved-ws by itself is a\n hint that the user wants --color-moved to be used. If it turns\n out that there are some valid use cases where --color-moved-ws\n may have to be set but the color-moved feature should not be\n enabled, then\n\n\tdiff --color-moved-ws=ignore-all-space --no-color-moved\n\n can be used to countermand this, of course.\n\nAm I missing something or are these mere small sloppiness in the\ncurrent code?\n\n\n\n"},{"id":"360245","messageId":"20181011225928.76051-1-sbeller@google.com","threadId":"49522","inReplyTo":"xmqqa7nkf6o4.fsf@gitster-ct.c.googlers.com","subject":"[PATCH] diff.c: die on unknown color-moved ws mode","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2018-10-11T22:59:28Z","receivedAt":"2018-10-11T22:59:33Z","isPatch":true,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"Noticed-by: Junio C Hamano \nSigned-off-by: Stefan Beller \n--- \n\n\n There is no \"ignore-any\" supported by the feature---I think that\n the parser for the option should have noticed and barfed, but it\n did not. It merely emitted a message to the standard output and\n let it scroll away with the huge diff before the reader noticed\n it.\n \nAddressed in this patch.\n\n Am I missing something [...] ?\n\nNote that this parsing is used for both the parsing from command line\nas well as options, i.e.\n\n git config diff.colorMovedWS asdf\n git format-patch HEAD^\nfatal: ignoring unknown color-moved-ws mode 'asdf'\n git config --unset diff.colorMovedWS\n\n(format-patch parses these color specific things, but doesn't apply it)\n \n diff.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/diff.c b/diff.c\nindex 145cfbae59..bdf4535d69 100644\n--- a/diff.c\n+++ b/diff.c\n@@ -313,7 +313,7 @@ static int parse_color_moved_ws(const char *arg)\n \t\telse if (!strcmp(sb.buf, \"allow-indentation-change\"))\n \t\t\tret |= COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE;\n \t\telse\n-\t\t\terror(_(\"ignoring unknown color-moved-ws mode '%s'\"), sb.buf);\n+\t\t\tdie(_(\"ignoring unknown color-moved-ws mode '%s'\"), sb.buf);\n \n \t\tstrbuf_release(&sb);\n \t}\n-- \n2.19.0\n\n"},{"id":"360247","messageId":"CAGZ79kbpHB8QPXTRsZhnxrrTm=P8Mg3CHpvZB+G1E7BmFRv9sQ@mail.gmail.com","threadId":"49522","inReplyTo":"20181011225928.76051-1-sbeller@google.com","subject":"Re: [PATCH] diff.c: die on unknown color-moved ws mode","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2018-10-11T23:01:52Z","receivedAt":"2018-10-11T23:02:05Z","isPatch":true,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"On Thu, Oct 11, 2018 at 3:59 PM Stefan Beller wrote:\n\n> - error(_(\"ignoring unknown color-moved-ws mode '%s'\"), sb.buf);\n> + die(_(\"ignoring unknown color-moved-ws mode '%s'\"), sb.buf);\n\ns/ignoring// as it was sent in a haste.\n"},{"id":"360248","messageId":"CAGZ79ka1pxPt+xT3vBa5xARG5P+Hd19sjOLO_y_zofVStsDWNQ@mail.gmail.com","threadId":"49522","inReplyTo":"xmqqa7nkf6o4.fsf@gitster-ct.c.googlers.com","subject":"Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2018-10-11T23:06:32Z","receivedAt":"2018-10-11T23:06:46Z","isPatch":false,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"On Thu, Oct 11, 2018 at 3:41 PM Junio C Hamano wrote:\n\n> * After fixing ignore-any to one of the supported option\n> (e.g. \"ignore-all-spaces\"), the color-moved feature still did not\n> trigger. I think the presence of --color-moved-ws by itself is a\n> hint that the user wants --color-moved to be used. If it turns\n> out that there are some valid use cases where --color-moved-ws\n> may have to be set but the color-moved feature should not be\n> enabled, then\n>\n> diff --color-moved-ws=ignore-all-space --no-color-moved\n>\n> can be used to countermand this, of course.\n\nI had the same idea for --color-moved to imply --color, but there\nwe had some issues with configured settings, as we do not want\ndiff.colorMoved to imply colored patches, but only when given on\nthe command line.\n\nI think we should add these tweaks, such that\ncolor-moved-ws implies color-moved (both config and CLI options)\nand --color-moved implies --color (command line only)\n"},{"id":"360259","messageId":"xmqqmurkdm1i.fsf@gitster-ct.c.googlers.com","threadId":"49522","inReplyTo":"CAGZ79ka1pxPt+xT3vBa5xARG5P+Hd19sjOLO_y_zofVStsDWNQ@mail.gmail.com","subject":"Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-10-12T00:51:53Z","receivedAt":"2018-10-12T00:52:00Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Stefan Beller writes:\n\n> I think we should add these tweaks, such that\n> color-moved-ws implies color-moved (both config and CLI options)\n> and --color-moved implies --color (command line only)\n\nI am not sure what you mean by \"both config and\". I'd find it\nentirely sensible for a user to say \"I do not always use the\ncolor-moved option, but when I do, I want it to handle the\nwhitespace differences this way by default\".\n\nSo presence of diff.colorMovedWS configuration variable should never\ntrigger the color-moved feature by itself, I would think.\n\n"},{"id":"360262","messageId":"xmqqin28dkm1.fsf@gitster-ct.c.googlers.com","threadId":"49522","inReplyTo":"20181011225928.76051-1-sbeller@google.com","subject":"Re: [PATCH] diff.c: die on unknown color-moved ws mode","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-10-12T01:22:46Z","receivedAt":"2018-10-12T01:22:52Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Stefan Beller writes:\n\n> Noticed-by: Junio C Hamano \n> Signed-off-by: Stefan Beller \n> --- \n>\n>\n> There is no \"ignore-any\" supported by the feature---I think that\n> the parser for the option should have noticed and barfed, but it\n> did not. It merely emitted a message to the standard output and\n> let it scroll away with the huge diff before the reader noticed\n> it.\n> \n> Addressed in this patch.\n>\n> Am I missing something [...] ?\n>\n> Note that this parsing is used for both the parsing from command line\n> as well as options, i.e.\n\nHmph, is it our convention for a value that is not yet known to the\ncurrent version of Git found in a configuration file to cause it to\ndie? I somehow thought that command line options are checked more\nstrictly and configuration variables are parsed more leniently.\n\nIf that is the case, the place that dies need to be raised in the\ncallchain; iow, instead of dying inside the parser, it is necessary\nto let it only detect a problem and allow the caller to decide what\nto do with the problem, I would think.\n\n> git config diff.colorMovedWS asdf\n> git format-patch HEAD^\n> fatal: ignoring unknown color-moved-ws mode 'asdf'\n> git config --unset diff.colorMovedWS\n\n\n\n>\n> (format-patch parses these color specific things, but doesn't apply it)\n> \n> diff.c | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/diff.c b/diff.c\n> index 145cfbae59..bdf4535d69 100644\n> --- a/diff.c\n> +++ b/diff.c\n> @@ -313,7 +313,7 @@ static int parse_color_moved_ws(const char *arg)\n> \t\telse if (!strcmp(sb.buf, \"allow-indentation-change\"))\n> \t\t\tret |= COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE;\n> \t\telse\n> -\t\t\terror(_(\"ignoring unknown color-moved-ws mode '%s'\"), sb.buf);\n> +\t\t\tdie(_(\"ignoring unknown color-moved-ws mode '%s'\"), sb.buf);\n> \n> \t\tstrbuf_release(&sb);\n> \t}\n"},{"id":"360286","messageId":"nycvar.QRO.7.76.6.1810121054050.45@tvgsbejvaqbjf.bet","threadId":"49522","inReplyTo":"645452fda0ae411d86487b76aaac8151-mfwitten@gmail.com","subject":"Re: `--rebase-merges' still failing badly","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-10-12T09:11:51Z","receivedAt":"2018-10-12T09:12:06Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Michael,\n\nOn Wed, 10 Oct 2018, Michael Witten wrote:\n\n> In my opinion, the `--rebase-merges' feature has been broken since the\n> beginning, and the builtin version should be fixed before it is moved\n> ahead.\n\nEverybody is entitled to an opinion. My opinion differs from yours, and I\nam a heavy user of `git rebase -kir`.\n\nThe `--rebase-merges` feature is not without problems, of course. I can\nname a couple of bugs, but I have a hunch that it is more efficient for me\nto just fix them.\n\n> In short: \"labels\" are brittle; see below for tests.\n\nSure, let's improve them.\n\n> Also, here are some quick *additional* thoughts:\n> \n> * Labels should be simply \"r0\", \"r1\", ... \"rN\".\n\nThat would not be an improvement.\n\nThe *interactive* version of `--rebase-merges` is what I use extensively\nto juggle Git for Windows' branch thicket. It would be really bad if I had\nto somehow map those label names in my head, rather than having the\nintuitively-understood labels.\n\nI would understand if you suggested to try to come up with a better naming\nthan `branch-point-`. But `r`? That's worse than the current state.\nBy a lot.\n\n> * Why is the command \"label\" and not \"branch\"?\n\nBecause it is more versatile than just a branch. It is also branch points.\nAs a matter of fact, the very first statement is about the `onto` label,\nwhich is not a branch.\n\n> * In my experience, there's a lot of this boiler plate:\n> \n> pick 12345\n> label r1\n> reset r0\n> merge r1\n> \n> How about instead, use git's existing ideas:\n> \n> pick 12345\n> reset r0\n> merge ORIG_HEAD\n\nToo magic. And you cannot change it easily. I had this very real example,\na couple of times yesterday: A merge was in one of the \"branches\", and\nneeded to be moved out of it:\n\n\tpick abc\n\tlabel branch-point\n\tmerge -C 0123 topic\n\tpick def\n\tlabel bug-fix\n\n\treset branch-point\n\tmerge -C 4567 bug-fix\n\nThis `merge -C 0123 topic` needed to be moved before the branch point.\n\nAnother example where the explicit labeling comes in *real* handy is when\nI made a Pull Request in Git for Windows ready for contribution to core\nGit. These Pull Requests are normally based on `master`, because that is\nwhat the best PR flow is: you based your contributions as close to the tip\nas possible, to avoid merge conflicts (and to test as close to the real,\nafter-merge thing). This would look like this:\n\n\tlabel branch-point\n\tpick 123\n\tpick 456\n\tlabel pr-0815\n\n\treset branch-point\n\tmerge -C abc pr-0815\n\nNow, to prepare this for core Git, I have to graft this PR onto the\n`master` of *upstream*, in our case I would use the `onto` label for that,\nby inserting a `reset onto` just before `pick 123`.\n\nSo you see, the current, non-implicit, but very much explicit syntax,\nmakes all of these tasks *quite* easy, and more importantly,\nstraight-forward: I did not have to explain this to anyone who I needed to\nteach how this works.\n\nRemember: the syntax of the todo list is not optimized to be short. It is\noptimized to be *editable*. I need to have a very easy way to juggle\ncriss-cross-merging branch thickets. And the current syntax, while\nchattier than you would like, does the job. Pretty well, even.\n\n> * Why not just `--merges' instead of `--rebase-merges'?\n\nThis ship has sailed. It is pointless to discuss this now.\n\nBesides, I believe that in your quest to shorten things, you unfortunately\nshortened things too much: it is no longer clear what \"merges\" means in\nthe context of `--merges`.\n\n> Unfortunately, both the legacy version and the rewrite of\n> `--rebase-merges' display a bug that makes this feature fairly\n> unusable in practice;\n\nYou will be surprised just how much I would embrace bug fixes, once you\nprovide any.\n\n> it tries to create a \"label\" (i.e., a branch name) from a commit log\n> summary line, and the result is often invalid (or just plain\n> irritating to work with). In particular, it fails on typical\n> characters, including at least these:\n> \n> :/\\?.*[]\n\nAnd of course those are not the only ones. The trick is to reduce runs of\ndisallowed characters to dashes, as is already done with spaces.\n\nCiao,\nJohannes\n\n> \n> To see this, first define some POSIX shell functions:\n> \n> test()\n> {\n> (\n> set -e\n> summary=$1\n> d=/tmp/repo ##### WARNING. CHANGE IF NECESSARY.\n> rm -rf \"$d\"; mkdir -p \"$d\"; cd \"$d\"\n> git init -q\n> echo a > a; git add a; git commit -q -m a\n> git branch base\n> echo b > b; git add b; git commit -q -m b\n> git reset -q --hard HEAD^\n> git merge -q --no-ff -m \"$summary\" ORIG_HEAD\n> git log --graph --oneline\n> git rebase --rebase-merges base\n> ); status=$?\n> echo\n> return \"$status\"\n> }\n> \n> Test()\n> {\n> if test \"$@\" 1>/dev/null 2>&1; then\n> echo ' good'; return 0\n> else\n> echo ' fail'; return 1\n> fi\n> }\n> \n> Then, try various commit summaries (see below for results):\n> \n> test c\n> test 'combine these into a merge: a and b'\n> Test ab:\n> Test a:b\n> Test :\n> Test a/b\n> Test 'Now supports /regex/'\n> Test ab/\n> Test /ab\n> Test /\n> Test 'a\\b'\n> Test '\\'\n> Test 'Maybe this works?'\n> Test '?'\n> Test 'This does not work.'\n> Test 'This works. Strange!'\n> Test .git\n> Test .\n> Test 'Cast each pointer to *void'\n> Test '*'\n> Test 'return a[1] not a[0]'\n> Test '[ does not work'\n> Test '['\n> Test '] does work'\n> Test ']'\n> \n> Here are the results of pasting the above commands into my terminal:\n> \n> $ test c\n> warning: templates not found in ../install/share/git-core/templates\n> * 1992d07 (HEAD -> master) c\n> |\\\n> | * 34555b5 b\n> |/\n> * 338db9b (base) a\n> Successfully rebased and updated refs/heads/master.\n> \n> $ test 'combine these into a merge: a and b'\n> warning: templates not found in ../install/share/git-core/templates\n> * 4202c49 (HEAD -> master) combine these into a merge: a and b\n> |\\\n> | * 34555b5 b\n> |/\n> * 338db9b (base) a\n> error: refusing to update ref with bad name 'refs/rewritten/combine-these-into-a-merge:-a-and-b'\n> hint: Could not execute the todo command\n> hint:\n> hint: label combine-these-into-a-merge:-a-and-b\n> hint:\n> hint: It has been rescheduled; To edit the command before continuing, please\n> hint: edit the todo list first:\n> hint:\n> hint: git rebase --edit-todo\n> hint: git rebase --continue\n> \n> $ Test ab:\n> fail\n> $ Test a:b\n> fail\n> $ Test :\n> fail\n> $ Test a/b\n> good\n> $ Test 'Now supports /regex/'\n> fail\n> $ Test ab/\n> fail\n> $ Test /ab\n> fail\n> $ Test /\n> fail\n> $ Test 'a\\b'\n> fail\n> $ Test '\\'\n> fail\n> $ Test 'Maybe this works?'\n> fail\n> $ Test '?'\n> fail\n> $ Test 'This does not work.'\n> fail\n> $ Test 'This works. Strange!'\n> good\n> $ Test .git\n> fail\n> $ Test .\n> fail\n> $ Test 'Cast each pointer to *void'\n> fail\n> $ Test '*'\n> fail\n> $ Test 'return a[1] not a[0]'\n> fail\n> $ Test '[ does not work'\n> fail\n> $ Test '['\n> fail\n> $ Test '] does work'\n> good\n> $ Test ']'\n> good\n> \n"},{"id":"360293","messageId":"ca3b162d-d1c6-1ed1-cb20-4232d91f7b51@talktalk.net","threadId":"49522","inReplyTo":"xmqqa7nkf6o4.fsf@gitster-ct.c.googlers.com","subject":"Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)","fromName":"Phillip Wood","fromEmail":"phillip.wood@talktalk.net","sentAt":"2018-10-12T09:59:06Z","receivedAt":"2018-10-12T09:59:12Z","isPatch":false,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"On 11/10/2018 23:40, Junio C Hamano wrote:\n> Phillip Wood writes:\n> \n>> On 10/10/2018 06:43, Junio C Hamano wrote:\n>>> 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\n>>> the integration branches, but I am still holding onto them.\n>>>\n>>> * pw/diff-color-moved-ws-fix (2018-10-04) 5 commits\n>>> - diff --color-moved: fix a memory leak\n>>> - diff --color-moved-ws: fix another memory leak\n>>> - diff --color-moved-ws: fix a memory leak\n>>> - diff --color-moved-ws: fix out of bounds string access\n>>> - diff --color-moved-ws: fix double free crash\n>>>\n>>> Various fixes to \"diff --color-moved-ws\".\n>>>\n>>> What's the status of this topic?\n>>\n>> I think it is ready for next - Stefan was happy with the last iteration.\n> \n> This is not about your fixes, but I was skimming the color-moved\n> support in general as a final sanity check to move this forward and\n> noticed that\n> \n> \t$ git diff --color-moved-ws=ignore-any master...\n> \n> does not do anything interesting, which is broken at at least two\n> points.\n> \n> * There is no \"ignore-any\" supported by the feature---I think that\n> the parser for the option should have noticed and barfed, but it\n> did not. It merely emitted a message to the standard output and\n> let it scroll away with the huge diff before the reader noticed\n> it.\n\nIt would be nice if the parsing used starts_with(option_name, user_text)\nrather than strcmp() as well. Also I think --color-moved=no is valid as\na synonym of --no-color-moved but --color-moved-ws=no is not supported.\n\n> * After fixing ignore-any to one of the supported option\n> (e.g. \"ignore-all-spaces\"), the color-moved feature still did not\n> trigger. I think the presence of --color-moved-ws by itself is a\n> hint that the user wants --color-moved to be used. If it turns\n> out that there are some valid use cases where --color-moved-ws\n> may have to be set but the color-moved feature should not be\n> enabled, then\n> \n> \tdiff --color-moved-ws=ignore-all-space --no-color-moved\n> \n> can be used to countermand this, of course.\n> \n> Am I missing something or are these mere small sloppiness in the\n> current code?\n> \n> \n> \n\n"},{"id":"360307","messageId":"xmqqbm7zb81z.fsf@gitster-ct.c.googlers.com","threadId":"49522","inReplyTo":"ca3b162d-d1c6-1ed1-cb20-4232d91f7b51@talktalk.net","subject":"Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-10-12T13:36:56Z","receivedAt":"2018-10-12T13:37:01Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Phillip Wood writes:\n\n> It would be nice if the parsing used starts_with(option_name, user_text)\n> rather than strcmp() as well. Also I think --color-moved=no is valid as\n> a synonym of --no-color-moved but --color-moved-ws=no is not supported.\n\nI am not sure about starts_with(). Do you mean we should accept\n\"--color-mo\", as that is a prefix of \"--color-moved\" that is not\nshared with any existing option, until we gain a different option\n\"--color-more\"?\n\nIf you mean \"--color-moved-ws=no\" (or \"--no-color-moved-ws\") as a\nway to countermand an earlier --color-moved-ws= on the\ncommand line, I fully agree that it is a good idea.\n"},{"id":"360405","messageId":"CACsJy8DNHCxz1cL+6rFxnWvQQz3T7_j8+=5u8=CxjraRzM89mw@mail.gmail.com","threadId":"49522","inReplyTo":"xmqq8t36mk4t.fsf@gitster-ct.c.googlers.com","subject":"Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2018-10-14T12:21:00Z","receivedAt":"2018-10-14T12:30:14Z","isPatch":false,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Wed, Oct 10, 2018 at 7:43 AM Junio C Hamano wrote:\n> * nd/per-worktree-ref-iteration (2018-10-07) 9 commits\n> - SQUASH???\n> - reflog expire: cover reflog from all worktrees\n> - fsck: check HEAD and reflog from other worktrees\n> - fsck: Move fsck_head_link() to get_default_heads() to avoid some globals\n> - revision.c: better error reporting on ref from different worktrees\n> - revision.c: correct a parameter name\n> - refs: new ref types to make per-worktree refs visible to all worktrees\n> - Add a place for (not) sharing stuff between worktrees\n> - refs.c: indent with tabs, not spaces\n>\n> What's the status of this topic?\n\nThere's one bug spotted by Eric and a few test cases to be added in\nthe reflog patch.\n--\nDuy\n"},{"id":"360623","messageId":"9521f0a8-efa7-46d7-1aeb-aea700fc2fed@talktalk.net","threadId":"49522","inReplyTo":"xmqqbm7zb81z.fsf@gitster-ct.c.googlers.com","subject":"Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)","fromName":"Phillip Wood","fromEmail":"phillip.wood@talktalk.net","sentAt":"2018-10-16T13:38:59Z","receivedAt":"2018-10-16T13:39:05Z","isPatch":false,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"On 12/10/2018 14:36, Junio C Hamano wrote:\n> Phillip Wood writes:\n> \n>> It would be nice if the parsing used starts_with(option_name, user_text)\n>> rather than strcmp() as well. Also I think --color-moved=no is valid as\n>> a synonym of --no-color-moved but --color-moved-ws=no is not supported.\n> \n> I am not sure about starts_with(). Do you mean we should accept\n> \"--color-mo\", as that is a prefix of \"--color-moved\" that is not\n> shared with any existing option, until we gain a different option\n> \"--color-more\"?\n\nI was thinking of the option arguments rather than the option names \nalthough being able to abbreviate the names in the same way as the \ncommands that parse_options() would be good too (I seem to remember \nsomeone saying they had some rough patches to use parse_options() for \ndiff and log in a discussion of adding completion support to \nparse_options())\n\n> If you mean \"--color-moved-ws=no\" (or \"--no-color-moved-ws\") as a\n> way to countermand an earlier --color-moved-ws= on the\n> command line, I fully agree that it is a good idea.\n\nOh I assumed --no-color-moved-ws was allowed but it isn't it. Allowing \n--color-moved-ws=no as well would match what is allowed for \n--color-moved. I'll try and look at that.\n\nBest Wishes\n\nPhillip\n\n"},{"id":"360642","messageId":"CAGZ79kZqnbmMS_iE6hAXtA5F=_PZUrAiND1W5ictO1QMR-_wxg@mail.gmail.com","threadId":"49522","inReplyTo":"9521f0a8-efa7-46d7-1aeb-aea700fc2fed@talktalk.net","subject":"Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2018-10-16T17:13:59Z","receivedAt":"2018-10-16T17:14:15Z","isPatch":false,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"On Tue, Oct 16, 2018 at 6:39 AM Phillip Wood wrote:\n> > If you mean \"--color-moved-ws=no\" (or \"--no-color-moved-ws\") as a\n> > way to countermand an earlier --color-moved-ws= on the\n> > command line, I fully agree that it is a good idea.\n>\n> Oh I assumed --no-color-moved-ws was allowed but it isn't it. Allowing\n> --color-moved-ws=no as well would match what is allowed for\n> --color-moved. I'll try and look at that.\n\nThanks for taking a look!\nStefan\n"}]}