From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-3.1 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 9619F1F5AE for ; Sun, 2 May 2021 12:00:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232123AbhEBMBL (ORCPT ); Sun, 2 May 2021 08:01:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232056AbhEBMBI (ORCPT ); Sun, 2 May 2021 08:01:08 -0400 Received: from mail-il1-x12f.google.com (mail-il1-x12f.google.com [IPv6:2607:f8b0:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73E8EC06174A for ; Sun, 2 May 2021 05:00:16 -0700 (PDT) Received: by mail-il1-x12f.google.com with SMTP id j20so1869268ilo.10 for ; Sun, 02 May 2021 05:00:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ixM/FFr8G/bzAkeCdQt/zA4DKAbdzd0DhaMDIC2064k=; b=fT4yEncmWaC4Dx3ftUBvG3eGD5IRjJQmUH5VZBlL0Qt5CiagKo344Q0VAdqPC/jN66 549DNA9rb8AnDCI5jmIdzi3ux++3JPzVgVZcZhDnENlkaofeCJs9kChsjc0HNuA9RebX oqaFmHXdst2YgaZIdV222dcD37DvzX6l0zpl/9ws934EFGAs/rf9OH5OzioFjMGmWGiu tTfXSs/5Rvck7HJqnZY7ob/YFx/qUG9BXdMWfG4VdE0+KQ79OHz3cfwa4HHrKUrgx2Wp f2EQmmSy4kSBs6ZeWxaN8Ha1oDOqNfZSlAvatZVr9YnuH/3LCTsXt5/v/jhLgppgdDue LLLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ixM/FFr8G/bzAkeCdQt/zA4DKAbdzd0DhaMDIC2064k=; b=NA6F+MGLfSM2Aj3g6ZFV+AOYBtNE2tR5txuPgJ1VjfWoMDZBy9kKFQ6rdaRCwb6siA OZJXSAX0GRKS5VBicz2dQgC4hk0NT8IotQs1wC75/2C24Tq47+gMhJra0UbEmUmSZw+7 RCVZQpD+bFTkkciY4Jhm6pnKax7lVwg/e53noo1medJLz/k2L3kLhAiu/dgqFXwy0Gip hcWSMcuzcVBXnHyPtWjDGQfN9TFm1FqHzZOr54KIAaLZVgiZ/qprwJMwo+t8YAu4mRCY rBmLEMIn3fVzxDNG103Z6fuQHcgHI1mFGpYQORL7BCrQ90h2SxZY8NoJVCNz0Vz2uAmx oMSg== X-Gm-Message-State: AOAM532FsmyR0EVArokvUf5c2ghOB1fzTSj7Jm0GvVnvRLBUyo/qyexK EC8DFlVZo8WcdH+T53vpwWPkOH7euW29LseMSkw= X-Google-Smtp-Source: ABdhPJwPUWXbPfJzVGIMP+6uQqE4rqXWQSJDrl/HHssASchZVmRAEXWEplDkVkZxNOS8lFe5Lns7x/z7XQnklx7Ow+c= X-Received: by 2002:a92:c20e:: with SMTP id j14mr2139080ilo.259.1619956815813; Sun, 02 May 2021 05:00:15 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: ZheNing Hu Date: Sun, 2 May 2021 20:00:02 +0800 Message-ID: Subject: Re: What's cooking in git.git (Apr 2021, #06; Thu, 29) To: Junio C Hamano Cc: Git List Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Hi, Junio, > * zh/pretty-date-human (2021-04-27) 1 commit > - pretty: provide human date format > (this branch uses ab/pretty-date-format-tests.) > > "git log --format=..." placeholders learned %ah/%ch placeholders to > request the --date=human output. > > Will merge to 'next'? > Here is a small typo error, I forget a small blank, which was pointed out by Josh Soref in https://github.com/gitgitgadget/git/pull/939 - '%ch':: committer date, human style(like the `--date=human` option of + '%ch':: committer date, human style (like the `--date=human` option of > -------------------------------------------------- > [Stalled] > > * jh/rfc-builtin-fsmonitor (2021-04-08) 23 commits > - t7527: test status with untracked-cache and fsmonitor--daemon > - p7519: add fsmonitor--daemon > - t7527: create test for fsmonitor--daemon > - fsmonitor: force update index when fsmonitor token advances > - fsmonitor--daemon: use a cookie file to sync with file system > - fsmonitor--daemon:: introduce client delay for testing > - fsmonitor--daemon: periodically truncate list of modified files > - fsmonitor--daemon: implement handle_client callback > - fsmonitor-fs-listen-macos: implement FSEvent listener on MacOS > - fsmonitor-fs-listen-macos: add macos header files for FSEvent > - fsmonitor-fs-listen-win32: implement FSMonitor backend on Windows > - fsmonitor--daemon: create token-based changed path cache > - fsmonitor--daemon: define token-ids > - fsmonitor--daemon: add pathname classification > - fsmonitor--daemon: implement daemon command options > - fsmonitor-fs-listen-macos: stub in backend for MacOS > - fsmonitor-fs-listen-win32: stub in backend for Windows > - fsmonitor--daemon: implement client command options > - fsmonitor--daemon: add a built-in fsmonitor daemon > - fsmonitor: introduce `core.useBuiltinFSMonitor` to call the daemon via IPC > - config: FSMonitor is repository-specific > - fsmonitor-ipc: create client routines for git-fsmonitor--daemon > - Merge branch 'jh/simple-ipc' into jh/rfc-builtin-fsmonitor > > An attempt to write and ship with a watchman equivalent tailored > for our use. > > > * ag/merge-strategies-in-c (2021-03-17) 15 commits > - sequencer: use the "octopus" merge strategy without forking > - sequencer: use the "resolve" strategy without forking > - merge: use the "octopus" strategy without forking > - merge: use the "resolve" strategy without forking > - merge-octopus: rewrite in C > - merge-recursive: move better_branch_name() to merge.c > - merge-resolve: rewrite in C > - merge-one-file: rewrite in C > - update-index: move add_cacheinfo() to read-cache.c > - merge-index: add a new way to invoke `git-merge-one-file' > - merge-index: drop the index > - merge-index: libify merge_one_path() and merge_all() > - t6060: add tests for removed files > - t6060: modify multiple files to expose a possible issue with merge-index > - t6407: modernise tests > > The resolve and octopus merge strategy backends have been rewritten > in C. > > Expecting a (hopefully final) reroll. > cf. > > > * ab/describe-tests-fix (2021-04-29) 5 commits > - describe tests: support -C in "check_describe" > - describe tests: fix nested "test_expect_success" call > - describe tests: don't rely on err.actual from "check_describe" > - describe tests: refactor away from glob matching > - describe tests: improve test for --work-tree & --dirty > (this branch uses ab/test-lib-updates.) > > Various updates to tests around "git describe" > > > * ab/pickaxe-pcre2 (2021-04-29) 22 commits > - xdiff-interface: replace discard_hunk_line() with a flag > - xdiff users: use designated initializers for out_line > - pickaxe -G: don't special-case create/delete > - pickaxe -G: terminate early on matching lines > - xdiff-interface: allow early return from xdiff_emit_line_fn > - xdiff-interface: prepare for allowing early return > - pickaxe -S: slightly optimize contains() > - pickaxe: rename variables in has_changes() for brevity > - pickaxe -S: support content with NULs under --pickaxe-regex > - pickaxe: assert that we must have a needle under -G or -S > - pickaxe: refactor function selection in diffcore-pickaxe() > - perf: add performance test for pickaxe > - pickaxe/style: consolidate declarations and assignments > - diff.h: move pickaxe fields together again > - pickaxe: die when --find-object and --pickaxe-all are combined > - pickaxe: die when -G and --pickaxe-regex are combined > - pickaxe tests: add missing test for --no-pickaxe-regex being an error > - pickaxe tests: test for -G, -S and --find-object incompatibility > - pickaxe tests: add test for "log -S" not being a regex > - pickaxe tests: add test for diffgrep_consume() internals > - pickaxe tests: refactor to use test_commit --append --printf > - grep/pcre2 tests: reword comments referring to kwset > (this branch uses ab/test-lib-updates.) > > Rewrite the backend for "diff -G/-S" to use pcre2 engine when > available. > > > * es/config-hooks (2021-03-10) 36 commits > . run-command: stop thinking about hooks > . git-send-email: use 'git hook run' for 'sendemail-validate' > . bugreport: use hook_exists instead of find_hook > . 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: introduce hook_exists() > . hook: add 'run' subcommand > . parse-options: parse into strvec > . hook: implement hookcmd..skip > . hook: teach 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. > > -------------------------------------------------- > [Cooking] > > * dl/complete-stash (2021-03-24) 3 commits > (merged to 'next' on 2021-03-24 at ce573a99cc) > + git-completion.bash: use __gitcomp_builtin() in _git_stash() > + git-completion.bash: extract from else in _git_stash() > + git-completion.bash: pass $__git_subcommand_idx from __git_main() > (this branch is used by dl/complete-stash-updates.) > > The command line completion (in contrib/) for "git stash" has been > updated. > > Wait until dl/complete-stash-updates matures. > > > * ba/object-info (2021-04-20) 1 commit > - object-info: support for retrieving object info > > Over-the-wire protocol learns a new request type to ask for object > sizes given a list of object names. > > > * zh/format-ref-array-optim (2021-04-20) 2 commits > - ref-filter: reuse output buffer > - ref-filter: get rid of show_ref_array_item > > "git (branch|tag) --format=..." has been micro-optimized. > > Will merge to 'next'? > > > * vs/completion-with-set-u (2021-04-16) 1 commit > (merged to 'next' on 2021-04-20 at 179933f961) > + completion: avoid aliased command lookup error in nounset mode > > Effort to make the command line completion (in contrib/) safe with > "set -u" continues. > > Will merge to 'master'. > > > * hn/prep-tests-for-reftable (2021-04-28) 21 commits > - t1415: set REFFILES for test specific to storage format > - t4202: mark bogus head hash test with REFFILES > - t7003: check reflog existence only for REFFILES > - t7900: mark pack-refs tests as REFFILES > - t1404: mark tests that muck with .git directly as REFFILES. > - t2017: mark --orphan/logAllRefUpdates=false test as REFFILES > - t1414: mark corruption test with REFFILES > - t1407: require REFFILES for for_each_reflog test > - test-lib: provide test prereq REFFILES > - t5304: use "reflog expire --all" to clear the reflog > - t5304: restyle: trim empty lines, drop ':' before > > - t7003: use rev-parse rather than FS inspection > - t5000: inspect HEAD using git-rev-parse > - t5000: reformat indentation to the latest fashion > - t1301: fix typo in error message > - t1413: use tar to save and restore entire .git directory > - t1401-symbolic-ref: avoid direct filesystem access > - t5601: read HEAD using rev-parse > - t9300: check ref existence using test-helper rather than a file system check > - t/helper/ref-store: initialize oid in resolve-ref > - t4202: split testcase for invalid HEAD symref and HEAD hash > > Preliminary clean-up of tests before the main reftable changes > hits the codebase. > > > * ps/config-env-option-with-separate-value (2021-04-19) 2 commits > - git: support separate arg for `--config-env`'s value > - git.txt: fix synopsis of `--config-env` missing the equals sign > > "git --config-env var=val cmd" weren't accepted (only > --config-env=var=val was). > > Will merge to 'next'. > possibly with minimum fix-up? > cf. > > > * ab/fsck-unexpected-type (2021-04-13) 6 commits > - fsck: report invalid object type-path combinations > - fsck: report invalid types recorded in objects > - object-store.h: move read_loose_object() below 'struct object_info' > - fsck: don't hard die on invalid object types > - fsck tests: refactor one test to use a sub-repo > - cache.h: move object functions to object-store.h > > "git fsck" has been taught to report mismatch between expected and > actual types of an object better. > > Expecting a reroll. > > > * jk/promisor-optim (2021-04-13) 3 commits > (merged to 'next' on 2021-04-15 at 41f303ef9b) > + revision: avoid parsing with --exclude-promisor-objects > + lookup_unknown_object(): take a repository argument > + is_promisor_object(): free tree buffer after parsing > (this branch is used by rs/repack-without-loosening-promised-objects.) > > Handling of "promisor packs" that allows certain objects to be > missing and lazily retrievable has been optimized (a bit). > > Will merge to 'master'. > > > * so/log-diff-merge (2021-04-16) 5 commits > (merged to 'next' on 2021-04-17 at 6c1eba8ee3) > + doc/diff-options: document new --diff-merges features > + diff-merges: introduce log.diffMerges config variable > + diff-merges: adapt -m to enable default diff format > + diff-merges: refactor set_diff_merges() > + diff-merges: introduce --diff-merges=on > > "git log" learned "--diff-merges=