From: Junio C Hamano Date: Tue, 22 Dec 2020 20:07:04 +0000 (-0800) Subject: What's cooking (2020/12 #04) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43c3722b289302cf599f9e3093f2124f64e7d00f;p=thirdparty%2Fgit.git What's cooking (2020/12 #04) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index b2b2f6ea3c..0b94991cbb 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,10 +1,10 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Dec 2020, #03; Fri, 18) +Subject: What's cooking in git.git (Dec 2020, #04; Tue, 22) X-master-at: 6d3ef5b467eccd2769f1aa1c555d317d3c8dc707 -X-next-at: 5298b911bdfa173511fab94a90a4302a2f1965b3 +X-next-at: acce13e5c41814e6303336cb470967b5b6cc9211 -What's cooking in git.git (Dec 2020, #03; Fri, 18) +What's cooking in git.git (Dec 2020, #04; Tue, 22) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are @@ -12,12 +12,7 @@ only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. -A release candidate 2.30-rc1 has been tagged; there are too many -topics in flight, sadly many of which haven't been adequately -reviewed. I think there are a couple of topics left in 'next' that -are obvious candidates for the final, but it would be lovely if we -can figure out how to get topics in 'seen' that haven't got enough -love unstuck. +Hopefully, the second release candidate -rc2 can be tagged tomorrow. Copies of the source code to Git live in many repositories, and the following is a list of the ones I push into or their mirrors. Some @@ -48,194 +43,79 @@ Release tarballs are available at: https://www.kernel.org/pub/software/scm/git/ -------------------------------------------------- -[Graduated to 'master'] - -* ab/unreachable-break (2020-12-15) 1 commit - (merged to 'next' on 2020-12-17 at 3eab6be401) - + style: do not "break" in switch() after "return" - - Code clean-up. - - -* dd/doc-p4-requirements-update (2020-12-14) 1 commit - (merged to 'next' on 2020-12-17 at 59649dd9a8) - + doc: mention Python 3.x supports - - Doc update. - - -* es/perf-export-fix (2020-12-16) 1 commit - (merged to 'next' on 2020-12-17 at 57489420ed) - + t/perf: fix test_export() failure with BSD `sed` - - Dev-support fix for BSD. - - -* jb/midx-doc-update (2020-12-14) 1 commit - (merged to 'next' on 2020-12-14 at 880b50e89d) - + docs: multi-pack-index: remove note about future 'verify' work - - Doc update. - - -* jc/compat-util-setitimer-fix (2020-12-15) 1 commit - (merged to 'next' on 2020-12-17 at 99a9af5066) - + compat-util: pretend that stub setitimer() always succeeds - - Fix a recent bug in a rarely used replacement code. - - -* jc/diff-I-status-fix (2020-12-16) 1 commit - (merged to 'next' on 2020-12-17 at d7cd43984a) - + diff: correct interaction between --exit-code and -I - - "git diff -I -exit-code" should exit with 0 status when - all the changes match the ignored pattern, but it didn't. - - -* jc/strmap-remove-typefix (2020-12-15) 1 commit - (merged to 'next' on 2020-12-17 at e94fef7216) - + strmap: make callers of strmap_remove() to call it in void context - - C-std compliance fix. - - -* jh/index-v2-doc-on-fsmn (2020-12-14) 1 commit - (merged to 'next' on 2020-12-14 at bd3507ccc8) - + index-format.txt: document v2 format of file system monitor extension - - Doc update. - - -* jk/oid-array-cleanup (2020-12-07) 9 commits - (merged to 'next' on 2020-12-14 at 362f6f2618) - + commit-graph: use size_t for array allocation and indexing - + commit-graph: replace packed_oid_list with oid_array - + commit-graph: drop count_distinct_commits() function - + oid-array: provide a for-loop iterator - + oid-array: make sort function public - + cache.h: move hash/oid functions to hash.h - + t0064: make duplicate tests more robust - + t0064: drop sha1 mention from filename - + oid-array.h: drop sha1 mention from header guard - - Code clean-up. - - -* js/init-defaultbranch-advice (2020-12-13) 4 commits - (merged to 'next' on 2020-12-15 at bcca948854) - + init: provide useful advice about init.defaultBranch - + get_default_branch_name(): prepare for showing some advice - + branch -m: allow renaming a yet-unborn branch - + init: document `init.defaultBranch` better - - Our users are going to be trained to prepare for future change of - init.defaultBranch configuration variable. - - -* js/t6300-hardcode-main (2020-12-07) 1 commit - (merged to 'next' on 2020-12-14 at 4eed7c6a8b) - + t6300: avoid using the default name of the initial branch - - Test update. - - -* js/t7064-master-to-initial (2020-12-08) 1 commit - (merged to 'next' on 2020-12-14 at b75529f792) - + t7064: avoid relying on a specific default branch name - - Test update. - - -* js/t7900-protect-pwd-in-config-get (2020-12-09) 1 commit - (merged to 'next' on 2020-12-14 at 61ff5e9b5b) - + t7900: use --fixed-value in git-maintenance tests - - Hotfix for test breakage. - +[New Topics] -* rb/nonstop-config-mak-uname-update (2020-12-16) 1 commit - (merged to 'next' on 2020-12-17 at 456a1bc21e) - + config.mak.uname: remove old NonStop compatibility settings +* dl/checkout-p-merge-base (2020-12-21) 1 commit + (merged to 'next' on 2020-12-21 at 595dd32b56) + + checkout -p: handle tree arguments correctly again - Build update. + Fix to a regression introduced during this cycle. + Will merge to 'master'. -* rj/make-clean (2020-12-08) 5 commits - (merged to 'next' on 2020-12-14 at 767b1398d7) - + Makefile: don't use a versioned temp distribution directory - + Makefile: don't try to clean old debian build product - + gitweb/Makefile: conditionally include ../GIT-VERSION-FILE - + Documentation/Makefile: conditionally include ../GIT-VERSION-FILE - + Documentation/Makefile: conditionally include doc.dep - Build optimization. +* es/worktree-repair-both-moved (2020-12-21) 1 commit + - worktree: teach `repair` to fix multi-directional breakage + "git worktree repair" learned to take advantage of the fact that it + knows both ends (i.e. the main repository is found in the location + the command runs, the worktrees are given as arguments) to deal + with the case where both the repository and the worktree moved. -* tb/partial-clone-filters-fix (2020-12-03) 2 commits - (merged to 'next' on 2020-12-14 at d44e5942da) - + upload-pack.c: don't free allowed_filters util pointers - + builtin/clone.c: don't ignore transport_fetch_refs() errors + Will merge to 'next'. - Fix potential server side resource deallocation issues when - responding to a partial clone request. --------------------------------------------------- -[New Topics] +* fc/t6030-bisect-reset-removes-auxiliary-files (2020-12-21) 1 commit + - test: bisect-porcelain: fix location of files -* jc/config-pretend-gitdir (2020-12-15) 1 commit - - config: --pretend-git-dir for includeIf:gitdir + A 3-year old test that was not testing anything useful has been + corrected. - WIP + Will merge to 'next'. -* jc/deprecate-pack-redundant (2020-12-15) 1 commit - - pack-redundant: gauge the usage before proposing its removal +* ma/maintenance-crontab-fix (2020-12-21) 3 commits + (merged to 'next' on 2020-12-21 at 8cd8cc04f9) + + t7900-maintenance: test for magic markers + + gc: fix handling of crontab magic markers + + git-maintenance.txt: add missing word - Warn loudly when the "pack-redundant" command, which has been left - stale with almost unusable performance issues, gets used, as we no - longer want to recommend its use (instead just "repack -d" instead). + Hotfix for a topic of this cycle. + Will merge to 'master'. -* en/merge-ort-recursive (2020-12-16) 4 commits - - merge-ort: implement merge_incore_recursive() - - merge-ort: make clear_internal_opts() aware of partial clearing - - merge-ort: copy a few small helper functions from merge-recursive.c - - commit: move reverse_commit_list() from merge-recursive - (this branch uses en/merge-ort-2 and en/merge-ort-impl; is tangled with en/merge-ort-3.) - The ORT merge strategy learned to synthesize virtual ancestor tree - by recursively merging multiple merge bases together, just like the - recursive backend has done for years. +* mr/bisect-in-c-4 (2020-12-21) 7 commits + - bisect--helper: retire `--check-and-set-terms` subcommand + - bisect--helper: reimplement `bisect_skip` shell function in C + - bisect--helper: retire `--bisect-auto-next` subcommand + - bisect--helper: use `res` instead of return in BISECT_RESET case option + - bisect--helper: retire `--bisect-write` subcommand + - bisect--helper: reimplement `bisect_replay` shell function in C + - bisect--helper: reimplement `bisect_log` shell function in C - Will merge to 'next'. + Piecemeal of rewrite of "git bisect" in C continues. -* js/no-more-prepare-for-main-in-test (2020-12-16) 11 commits - (merged to 'next' on 2020-12-18 at d15a382d4d) - + tests: drop the `PREPARE_FOR_MAIN_BRANCH` prereq - + t9902: use `main` as initial branch name - + t6302: use `main` as initial branch name - + t5703: use `main` as initial branch name - + t5510: use `main` as initial branch name - + t5505: finalize transitioning to using the branch name `main` - + t3205: finalize transitioning to using the branch name `main` - + t3203: complete the transition to using the branch name `main` - + t3201: finalize transitioning to using the branch name `main` - + t3200: finish transitioning to the initial branch name `main` - + t1400: use `main` as initial branch name +* jt/clone-unborn-head (2020-12-21) 3 commits + . clone: respect remote unborn HEAD + . connect, transport: add no-op arg for future patch + . ls-refs: report unborn targets of symrefs - Test coverage fix. + "git clone" tries to locally check out the branch pointed at by + HEAD of the remote repository after it is done, but the protocol + did not convey the information necessary to do so when copying an + empty repository. The protocol v2 learned how to do so. - Will merge to 'master'. + Seems to break tests when merged to 'seen'. -* jx/pack-redundant-on-single-pack (2020-12-16) 1 commit - (merged to 'next' on 2020-12-18 at b819311529) - + pack-redundant: fix crash when one packfile in repo +* nk/refspecs-negative-fix (2020-12-21) 2 commits + (merged to 'next' on 2020-12-21 at 7d88169236) + + negative-refspec: improve comment on query_matches_negative_refspec + + negative-refspec: fix segfault on : refspec - "git pack-redandant" when there is only one packfile used to crash, - which has been corrected. + Hotfix for recent regression. Will merge to 'master'. @@ -354,6 +234,7 @@ Release tarballs are available at: the hash algorithm. Expecting a reroll. The intent is very good. + cf. <20200901144323.GA14554@dcvr> * ar/fetch-transfer-ipversion (2020-09-16) 1 commit @@ -374,7 +255,8 @@ Release tarballs are available at: cf. -* jc/war-on-dashed-git (2020-08-27) 1 commit +* jc/war-on-dashed-git (2020-12-21) 2 commits + - fixup??? git: catch an attempt to run "git-foo" - git: catch an attempt to run "git-foo" The first step to remove on-disk binaries for built-in subcommands @@ -383,20 +265,6 @@ Release tarballs are available at: On hold for now. -* dr/push-remoteref-fix (2020-04-23) 1 commit - - remote.c: fix handling of %(push:remoteref) - - The "%(push:remoteref)" placeholder in the "--format=" argument of - "git format-patch" (and friends) only showed what got explicitly - configured, not what ref at the receiving end would be updated when - "git push" was used, as it ignored the default behaviour (e.g. update - the same ref as the source). - - Discard for now. - cf. - cf. <20200911214358.acl3hy2e763begoo@feanor> - - * mk/use-size-t-in-zlib (2018-10-15) 1 commit - zlib.c: use size_t for size @@ -417,37 +285,6 @@ Release tarballs are available at: Needs review. -* fc/bash-completion-post-2.29 (2020-11-10) 26 commits - - completion: bash: shuffle __gitcomp functions - - completion: bash: cleanup __gitcomp* invocations - - completion: bash: add __gitcomp_opts - - completion: bash: improve __gitcomp description - - completion: bash: rename _get_comp_words_by_ref() - - completion: bash: trivial cleanup - - completion: bash: cleanup _get_comp_words_by_ref() - - completion: bash: refactor _get_comp_words_by_ref() - - completion: bash: simplify _get_comp_words_by_ref() - - test: completion: switch __gitcomp_nl prefix test - - completion: bash: simplify config_variable_name - - completion: bash: improve __gitcomp suffix code - - completion: bash: change suffix check in __gitcomp - - completion: bash: simplify __gitcomp - - completion: bash: refactor __gitcomp - - completion: bash: simplify equal suffix check - - completion: bash: factor out check in __gitcomp - - completion: bash: get rid of any non-append code - - completion: bash: get rid of _append() functions - - completion: bash: remove non-append functionality - - test: completion: add run_func() helper - - test: completion: fix currently typed words - - completion: bash: do not modify COMP_WORDBREAKS - - completion: bash: fix for suboptions with value - - completion: bash: add correct suffix in variables - - completion: bash: fix prefix detection in branch.* - - Needs review. - - * ag/merge-strategies-in-c (2020-11-24) 13 commits - sequencer: use the "octopus" merge strategy without forking - sequencer: use the "resolve" strategy without forking @@ -471,6 +308,72 @@ Release tarballs are available at: -------------------------------------------------- [Cooking] +* fc/bash-completion-post-2.29 (2020-12-19) 4 commits + - completion: bash: fix for multiple dash commands + - completion: bash: fix for suboptions with value + - completion: bash: add correct suffix in variables + - completion: bash: fix prefix detection in branch.* + + Needs review. + + +* jc/config-pretend-gitdir (2020-12-15) 1 commit + - config: --pretend-git-dir for includeIf:gitdir + + WIP + + +* jc/deprecate-pack-redundant (2020-12-15) 1 commit + - pack-redundant: gauge the usage before proposing its removal + + Warn loudly when the "pack-redundant" command, which has been left + stale with almost unusable performance issues, gets used, as we no + longer want to recommend its use (instead just "repack -d" instead). + + +* en/merge-ort-recursive (2020-12-16) 4 commits + - merge-ort: implement merge_incore_recursive() + - merge-ort: make clear_internal_opts() aware of partial clearing + - merge-ort: copy a few small helper functions from merge-recursive.c + - commit: move reverse_commit_list() from merge-recursive + (this branch uses en/merge-ort-2 and en/merge-ort-impl; is tangled with en/merge-ort-3.) + + The ORT merge strategy learned to synthesize virtual ancestor tree + by recursively merging multiple merge bases together, just like the + recursive backend has done for years. + + Will merge to 'next'. + + +* js/no-more-prepare-for-main-in-test (2020-12-16) 11 commits + (merged to 'next' on 2020-12-18 at d15a382d4d) + + tests: drop the `PREPARE_FOR_MAIN_BRANCH` prereq + + t9902: use `main` as initial branch name + + t6302: use `main` as initial branch name + + t5703: use `main` as initial branch name + + t5510: use `main` as initial branch name + + t5505: finalize transitioning to using the branch name `main` + + t3205: finalize transitioning to using the branch name `main` + + t3203: complete the transition to using the branch name `main` + + t3201: finalize transitioning to using the branch name `main` + + t3200: finish transitioning to the initial branch name `main` + + t1400: use `main` as initial branch name + + Test coverage fix. + + Will merge to 'master'. + + +* jx/pack-redundant-on-single-pack (2020-12-16) 1 commit + (merged to 'next' on 2020-12-18 at b819311529) + + pack-redundant: fix crash when one packfile in repo + + "git pack-redandant" when there is only one packfile used to crash, + which has been corrected. + + Will merge to 'master'. + + * mt/parallel-checkout-part-1 (2020-12-16) 9 commits - entry: add checkout_entry_ca() taking preloaded conv_attrs - entry: move conv_attrs lookup up to checkout_entry() @@ -541,7 +444,7 @@ Release tarballs are available at: Expecting a reroll. -* so/log-diff-merge (2020-12-16) 33 commits +* so/log-diff-merge (2020-12-21) 32 commits - t4013: add tests for --diff-merges=first-parent - doc/git-show: include --diff-merges description - doc/rev-list-options: document --first-parent changes merges format @@ -551,8 +454,6 @@ Release tarballs are available at: - diff-merges: add old mnemonic counterparts to --diff-merges - diff-merges: let new options enable diff without -p - diff-merges: do not imply -p for new options - - diff-merges: handle imply -p on -c/--cc logic for log.c - - diff-merges: fix style of functions definitions - diff-merges: implement new values for --diff-merges - diff-merges: make -m/-c/--cc explicitly mutually exclusive - diff-merges: refactor opt settings into separate functions @@ -563,6 +464,7 @@ Release tarballs are available at: - t4013: add tests for -m failing to override -c/--cc - t4013: support test_expect_failure through ':failure' magic - diff-merges: revise revs->diff flag handling + - diff-merges: handle imply -p on -c/--cc logic for log.c - diff-merges: introduce revs->first_parent_merges flag - diff-merges: new function diff_merges_set_dense_combined_if_unset() - diff-merges: new function diff_merges_suppress() @@ -590,98 +492,96 @@ Release tarballs are available at: * en/merge-ort-impl (2020-12-13) 21 commits - - merge-ort: free data structures in merge_finalize() - - merge-ort: add implementation of record_conflicted_index_entries() - - tree: enable cmp_cache_name_compare() to be used elsewhere - - merge-ort: add implementation of checkout() - - merge-ort: basic outline for merge_switch_to_result() - - merge-ort: step 3 of tree writing -- handling subdirectories as we go - - merge-ort: step 2 of tree writing -- function to create tree object - - merge-ort: step 1 of tree writing -- record basenames, modes, and oids - - merge-ort: have process_entries operate in a defined order - - merge-ort: add a preliminary simple process_entries() implementation - - merge-ort: avoid recursing into identical trees - - merge-ort: record stage and auxiliary info for every path - - merge-ort: compute a few more useful fields for collect_merge_info - - merge-ort: avoid repeating fill_tree_descriptor() on the same tree - - merge-ort: implement a very basic collect_merge_info() - - merge-ort: add an err() function similar to one from merge-recursive - - merge-ort: use histogram diff - - merge-ort: port merge_start() from merge-recursive - - merge-ort: add some high-level algorithm structure - - merge-ort: setup basic internal data structures - - Merge branch 'en/strmap' into en/merge-ort-impl + (merged to 'next' on 2020-12-21 at c551d7bda9) + + merge-ort: free data structures in merge_finalize() + + merge-ort: add implementation of record_conflicted_index_entries() + + tree: enable cmp_cache_name_compare() to be used elsewhere + + merge-ort: add implementation of checkout() + + merge-ort: basic outline for merge_switch_to_result() + + merge-ort: step 3 of tree writing -- handling subdirectories as we go + + merge-ort: step 2 of tree writing -- function to create tree object + + merge-ort: step 1 of tree writing -- record basenames, modes, and oids + + merge-ort: have process_entries operate in a defined order + + merge-ort: add a preliminary simple process_entries() implementation + + merge-ort: avoid recursing into identical trees + + merge-ort: record stage and auxiliary info for every path + + merge-ort: compute a few more useful fields for collect_merge_info + + merge-ort: avoid repeating fill_tree_descriptor() on the same tree + + merge-ort: implement a very basic collect_merge_info() + + merge-ort: add an err() function similar to one from merge-recursive + + merge-ort: use histogram diff + + merge-ort: port merge_start() from merge-recursive + + merge-ort: add some high-level algorithm structure + + merge-ort: setup basic internal data structures + + Merge branch 'en/strmap' into en/merge-ort-impl (this branch is used by en/merge-ort-2, en/merge-ort-3 and en/merge-ort-recursive.) The merge backend "done right" starts to emerge. - Will merge to 'next'. + Will cook in 'next'. -* es/config-hooks (2020-12-07) 34 commits - . run-command: stop thinking about hooks - . receive-pack: convert receive hooks to hook.h - . post-update: use hook.h library - . proc-receive: acquire hook list from hook.h - . receive-pack: convert 'update' hook to hook.h - . reference-transaction: look for hooks in config - . transport: convert pre-push hook to use config - . hook: convert 'post-rewrite' hook to config - . hooks: convert 'post-checkout' hook to hook library - . git-p4: use 'git hook' to run hooks - . receive-pack: convert push-to-checkout hook to hook.h - . read-cache: convert post-index-change hook to use config - . rebase: teach pre-rebase to use hook.h - . gc: use hook library for pre-auto-gc hook - . merge: use config-based hooks for post-merge hook - . am: convert applypatch hooks to use config - . commit: use config-based hooks - . hooks: allow callers to capture output - . run-command: allow capturing of collated output - . hook: provide stdin by string_list or callback - . run-command: add stdin callback for parallelization - . hook: allow specifying working directory for hooks - . hook: allow parallel hook execution - . run-command: allow stdin for run_processes_parallel - . hook: support passing stdin to hooks - . hook: replace find_hook() with hook_exists() - . hook: add 'run' subcommand - . parse-options: parse into strvec - . hook: implement hookcmd..skip - . hook: respect hook.runHookDir - . hook: include hookdir hook in list - . hook: add list command - . hook: scaffolding for git-hook subcommand - . doc: propose hooks managed by the config +* es/config-hooks (2020-12-21) 34 commits + - run-command: stop thinking about hooks + - receive-pack: convert receive hooks to hook.h + - post-update: use hook.h library + - proc-receive: acquire hook list from hook.h + - receive-pack: convert 'update' hook to hook.h + - reference-transaction: look for hooks in config + - transport: convert pre-push hook to use config + - hook: convert 'post-rewrite' hook to config + - hooks: convert 'post-checkout' hook to hook library + - git-p4: use 'git hook' to run hooks + - receive-pack: convert push-to-checkout hook to hook.h + - read-cache: convert post-index-change hook to use config + - rebase: teach pre-rebase to use hook.h + - gc: use hook library for pre-auto-gc hook + - merge: use config-based hooks for post-merge hook + - am: convert applypatch hooks to use config + - commit: use config-based hooks + - hooks: allow callers to capture output + - run-command: allow capturing of collated output + - hook: provide stdin by string_list or callback + - run-command: add stdin callback for parallelization + - hook: allow specifying working directory for hooks + - hook: allow parallel hook execution + - run-command: allow stdin for run_processes_parallel + - hook: support passing stdin to hooks + - hook: replace find_hook() with hook_exists() + - hook: add 'run' subcommand + - parse-options: parse into strvec + - hook: implement hookcmd..skip + - hook: respect hook.runHookDir + - hook: include hookdir hook in list + - hook: add list command + - hook: scaffolding for git-hook subcommand + - doc: propose hooks managed by the config The "hooks defined in config" topic. - Ejected for now, as it has been breaking the tip of 'seen' for too - long. - - -* hn/reftable (2020-12-09) 15 commits - . Add "test-tool dump-reftable" command. - . git-prompt: prepare for reftable refs backend - . Reftable support for git-core - . reftable: rest of library - . reftable: reftable file level tests - . reftable: read reftable files - . reftable: write reftable files - . reftable: a generic binary tree implementation - . reftable: reading/writing blocks - . reftable: (de)serialization for the polymorphic record type. - . reftable: add blocksource, an abstraction for random access reads - . reftable: utility functions - . reftable: add error related functionality - . reftable: add LICENSE - . init-db: set the_repository->hash_algo early on + Expecting doc updates, but otherwise seems to be progressing nicely. + + +* hn/reftable (2020-12-21) 16 commits + - SQUASH??? allow t0031 to run with any default branch name + - Add "test-tool dump-reftable" command. + - git-prompt: prepare for reftable refs backend + - Reftable support for git-core + - reftable: rest of library + - reftable: reftable file level tests + - reftable: read reftable files + - reftable: write reftable files + - reftable: a generic binary tree implementation + - reftable: reading/writing blocks + - reftable: (de)serialization for the polymorphic record type. + - reftable: add blocksource, an abstraction for random access reads + - reftable: utility functions + - reftable: add error related functionality + - reftable: add LICENSE + - init-db: set the_repository->hash_algo early on The "reftable" backend for the refs API. - Ejected for now, as it has been breaking the tip of 'seen' for too - long. - * ab/mktag (2020-12-09) 11 commits - SQUASH??? @@ -732,26 +632,28 @@ Release tarballs are available at: * en/merge-ort-2 (2020-12-13) 7 commits - - merge-ort: add modify/delete handling and delayed output processing - - merge-ort: add die-not-implemented stub handle_content_merge() function - - merge-ort: add function grouping comments - - merge-ort: add a paths_to_free field to merge_options_internal - - merge-ort: add a path_conflict field to merge_options_internal - - merge-ort: add a clear_internal_opts helper - - merge-ort: add a few includes + (merged to 'next' on 2020-12-21 at ef5b184349) + + merge-ort: add modify/delete handling and delayed output processing + + merge-ort: add die-not-implemented stub handle_content_merge() function + + merge-ort: add function grouping comments + + merge-ort: add a paths_to_free field to merge_options_internal + + merge-ort: add a path_conflict field to merge_options_internal + + merge-ort: add a clear_internal_opts helper + + merge-ort: add a few includes (this branch is used by en/merge-ort-3 and en/merge-ort-recursive; uses en/merge-ort-impl.) More "ORT" merge strategy. - Will merge to 'next'. + Will cook in 'next'. * fc/pull-merge-rebase (2020-12-15) 5 commits - - pull: display default warning only when non-ff - - pull: correct condition to trigger non-ff advice - - pull: get rid of unnecessary global variable - - pull: give the advice for choosing rebase/merge much later - - pull: refactor fast-forward check + (merged to 'next' on 2020-12-21 at acce13e5c4) + + pull: display default warning only when non-ff + + pull: correct condition to trigger non-ff advice + + pull: get rid of unnecessary global variable + + pull: give the advice for choosing rebase/merge much later + + pull: refactor fast-forward check When a user does not tell "git pull" to use rebase or merge, the command gives a loud message telling a user to choose between @@ -761,6 +663,8 @@ Release tarballs are available at: no reason to stop or force the user to choose between rebase or merge if the history fast-forwards. + Will cook in 'next'. + * pk/subsub-fetch-fix-take-2 (2020-12-09) 1 commit (merged to 'next' on 2020-12-14 at ccc01a5f66) @@ -868,3 +772,21 @@ Release tarballs are available at: that the "-dirty" indicator would align with "git describe --dirty", which does not consider having untracked files in the working tree as source of dirtiness. The inconsistency has been fixed. + + +-------------------------------------------------- +[Discarded] + +* dr/push-remoteref-fix (2020-04-23) 1 commit + - remote.c: fix handling of %(push:remoteref) + + The "%(push:remoteref)" placeholder in the "--format=" argument of + "git format-patch" (and friends) only showed what got explicitly + configured, not what ref at the receiving end would be updated when + "git push" was used, as it ignored the default behaviour (e.g. update + the same ref as the source). + + Discard for now. + cf. + cf. <20200911214358.acl3hy2e763begoo@feanor> +