git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / Atom feed
* What's cooking in git.git (Mar 2019, #01; Wed, 6)
@ 2019-03-06  1:34 Junio C Hamano
  2019-03-06  1:41 ` Denton Liu
                   ` (7 more replies)
  0 siblings, 8 replies; 31+ messages in thread
From: Junio C Hamano @ 2019-03-06  1:34 UTC (permalink / raw)
  To: git


What's cooking in git.git (Mar 2019, #01; Wed, 6)
--------------------------------------------------

Here are the topics that have been cooking.  Commits prefixed with
'-' are only in '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.

The maintenance track will be updated to preprare for 2.21.1 soonish,
to address breakages with certain versions of msgfmt in 2.21.0; the
tip of 'next' will also be updated at around the same time.

You can find the changes described here in the integration branches
of the repositories listed at

    http://git-blame.blogspot.com/p/git-public-repositories.html

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

* jk/bisect-final-output (2019-03-01) 3 commits
 - bisect: make diff-tree output prettier
 - bisect: fix internal diff-tree config loading
 - bisect: use string arguments to feed internal diff-tree

 The final report from "git bisect" used to show the suspected
 culprit using a raw "diff-tree", with which there is no output for
 a merge commit.  This has been updated to use a more modern and
 human readable output that still is concise enough.

 Will merge to 'next'.


* jk/fsck-doc (2019-03-05) 2 commits
 - fsck: always compute USED flags for unreachable objects
 - doc/fsck: clarify --connectivity-only behavior

 "git fsck --connectivity-only" omits computation necessary to sift
 the objects that are not reachable from any of the refs into
 unreachable and dangling.  This is now documented, and also the
 computation is done in order to show the dangling objects when
 requested (which is done by default, but can be overridden with
 the "--no-dangling" option).

 Will merge to 'next'.


* jk/no-sigpipe-during-network-transport (2019-03-05) 2 commits
 - fetch: ignore SIGPIPE during network operation
 - fetch: avoid calling write_or_die()

 On platforms where "git fetch" is killed with SIGPIPE (e.g. OSX),
 the upload-pack that runs on the other end that hangs up after
 detecting an error could cause "git fetch" to die with a signal,
 which led to a flakey test.  "git fetch" now ignores SIGPIPE during
 the network portion of its operation (this is not a problem as we
 check the return status from our write(2)s).

 Will merge to 'next'.


* jk/virtual-objects-do-exist (2019-03-05) 1 commit
 - rev-list: allow cached objects in existence check

 A recent update broke "is this object available to us?" check for
 well-known objects like an empty tree (which should yield "yes",
 even when there is no on-disk object for an empty tree), which has
 been corrected.

 Will merge to 'next'.


* js/anonymize-remote-curl-diag (2019-03-06) 2 commits
 - remote-curl: mark all error messages for translation
 - curl: anonymize URLs in error messages and warnings

 remote-http transport did not anonymize URLs reported in its error
 messages at places.

 Will merge to 'next' the bottom one.
 The i18n of die() messages conflicts with topics in flight, so will
 be dealt with separately when the tree is more quiescent.


* js/find-lib-h-with-ls-files-when-possible (2019-03-05) 1 commit
 - Makefile: use `git ls-files` to list header files, if possible

 The Makefile uses 'find' utility to enumerate all the *.h header
 files, which is expensive on platforms with slow filesystems; it
 now optionally uses "ls-files" if working within a repository,
 which is a trick similar to how all sources are enumerated to run
 ETAGS on.

 Will merge to 'next'.


* js/rebase-orig-head-fix (2019-03-04) 4 commits
 - built-in rebase: set ORIG_HEAD just once, before the rebase
 - built-in rebase: demonstrate that ORIG_HEAD is not set correctly
 - built-in rebase: use the correct reflog when switching branches
 - built-in rebase: no need to check out `onto` twice

 "gir rebase" that was reimplemented in C did not set ORIG_HEAD
 correctly, which has been corrected.

 Will merge to 'next'.


* js/rebase-recreate-merge (2019-03-01) 1 commit
 - rebase docs: fix "gitlink" typo

 Docfix.

 Will merge to 'next'.


* js/stress-test-ui-tweak (2019-03-04) 2 commits
 - tests: introduce --stress-jobs=<N>
 - tests: let --stress-limit=<N> imply --stress

 Dev support.

 Will merge to 'next'.


* js/untravis-windows (2019-03-01) 1 commit
 - travis: remove the hack to build the Windows job on Azure Pipelines

 Dev support.

 Will merge to 'next'.


* ma/asciidoctor-fixes (2019-03-01) 3 commits
 - asciidoctor-extensions: fix spurious space after linkgit
 - Documentation/Makefile: add missing dependency on asciidoctor-extensions
 - Documentation/Makefile: add missing xsl dependencies for manpages

 Build fix around use of asciidoctor instead of asciidoc

 Will merge to 'next'.


* nd/worktree-name-sanitization (2019-03-01) 1 commit
 - worktree add: sanitize worktree names

 Need to pick up a newer version.


* ra/t3600-test-path-funcs (2019-03-04) 3 commits
 - t3600: use helpers to replace test -d/f/e/s <path>
 - t3600: restructure code according to contemporary guidelines
 - test functions: add function `test_file_not_empty`

 A GSoC micro.

 Need to pick up a newer version.


* rd/gc-prune-doc-fix (2019-03-03) 1 commit
 - docs/git-gc: fix typo "--prune=all" to "--prune=now"

 Doxfix.

 Will merge to 'next'.


* dl/reset-doc-no-wrt-abbrev (2019-03-06) 1 commit
 - git-reset.txt: clarify documentation


* ja/dir-rename-doc-markup-fix (2019-03-06) 1 commit
 - Doc: fix misleading asciidoc formating

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

* ds/midx-expire-repack (2019-01-27) 10 commits
 - midx: add test that 'expire' respects .keep files
 - multi-pack-index: test expire while adding packs
 - midx: implement midx_repack()
 - multi-pack-index: prepare 'repack' subcommand
 - multi-pack-index: implement 'expire' subcommand
 - midx: refactor permutation logic and pack sorting
 - midx: simplify computation of pack name lengths
 - multi-pack-index: prepare for 'expire' subcommand
 - Docs: rearrange subcommands for multi-pack-index
 - repack: refactor pack deletion for future use

 "git multi-pack-index expire/repack" are new subcommands that
 consult midx file and are used to drop unused pack files and
 coalesce small pack files that are still in use.

 Comments?


* jt/test-protocol-version (2019-02-06) 8 commits
 - t5552: compensate for v2 filtering ref adv.
 - tests: fix protocol version for overspecifications
 - t5700: only run with protocol version 1
 - t5512: compensate for v0 only sending HEAD symrefs
 - t5503: fix overspecification of trace expectation
 - tests: always test fetch of unreachable with v0
 - tests: define GIT_TEST_PROTOCOL_VERSION
 - Merge branch 'js/protocol-advertise-multi' into jt/test-protocol-version
 (this branch uses js/protocol-advertise-multi.)

 Help developers by making it easier to run most of the tests under
 different versions of over-the-wire protocols.

 Blocked by js/protocol-advertise-multi


* js/protocol-advertise-multi (2018-12-28) 1 commit
 - protocol: advertise multiple supported versions
 (this branch is used by jt/test-protocol-version.)

 The transport layer has been updated so that the protocol version
 used can be negotiated between the parties, by the initiator
 listing the protocol versions it is willing to talk, and the other
 side choosing from one of them.

 Expecting a reroll.
 cf. <CANq=j3u-zdb_FvNJGPCmygNMScseav63GhVvBX3NcVS4f7TejA@mail.gmail.com>


* mk/use-size-t-in-zlib (2018-10-15) 1 commit
 - zlib.c: use size_t for size

 The wrapper to call into zlib followed our long tradition to use
 "unsigned long" for sizes of regions in memory, which have been
 updated to use "size_t".


* dl/remote-save-to-push (2018-12-11) 1 commit
 - remote: add --save-to-push option to git remote set-url

 "git remote set-url" learned a new option that moves existing value
 of the URL field to pushURL field of the remote before replacing
 the URL field with a new value.

 Anybody who wants to champion this topic?
 I am personally not yet quite convinced if this is worth pursuing.


* nb/branch-show-other-worktrees-head (2019-02-01) 3 commits
 - branch: add an extra verbose output displaying worktree path for refs checked out in a linked worktree
 - branch: mark and color a branch differently if it is checked out in a linked worktree
 - ref-filter: add worktreepath atom

 "git branch --list" learned to show branches that are checked out
 in other worktrees connected to the same repository prefixed with
 '+', similar to the way the currently checked out branch is shown
 with '*' in front.

 The top one probably deserves retitling.
 The second one is of dubious value.

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

* bp/post-index-change-hook (2019-02-15) 1 commit
  (merged to 'next' on 2019-02-23 at 70cc07cebe)
 + read-cache: add post-index-change hook

 A new hook "post-index-change" is called when the on-disk index
 file changes, which can help e.g. a virtualized working tree
 implementation.

 Will cook in 'next'.


* dl/doc-submodule-wo-subcommand (2019-02-15) 1 commit
  (merged to 'next' on 2019-02-23 at 2f1c1428f1)
 + submodule: document default behavior

 Doc update.

 Will merge to 'master'.


* jc/format-patch-error-check (2019-02-22) 3 commits
 - format-patch: --no-clobber refrains from overwriting output files
 - format-patch: notice failure to open cover letter for writing
 - builtin/log: downcase the beginning of error messages

 "git format-patch" used overwrite an existing patch/cover-letter
 file.  A new "--no-clobber" option stops it.

 Will merge to 'next' after dropping the tip commit.
 I think the bottom two were indenendently good changes; the top one
 was met with "Meh" by reviewer(s), and I tend to agree.


* jk/diff-no-index-initialize (2019-02-24) 1 commit
  (merged to 'next' on 2019-02-24 at f37a814eb0)
 + diff: reuse diff setup for --no-index case

 "git diff --no-index" may still want to access Git goodies like
 --ext-diff and --textconv, but so far these have been ignored,
 which has been corrected.

 Will merge to 'master'.


* jk/prune-optim (2019-02-14) 4 commits
  (merged to 'next' on 2019-02-23 at 7d03afc1c2)
 + t5304: rename "sha1" variables to "oid"
 + prune: check SEEN flag for reachability
 + prune: use bitmaps for reachability traversal
 + prune: lazily perform reachability traversal

 "git prune" has been taught to take advantage of reachability
 bitmap when able.

 Will merge to 'master'.


* jk/unused-params (2019-02-14) 10 commits
  (merged to 'next' on 2019-02-23 at 9b715907a1)
 + ref-filter: drop unused "sz" parameters
 + ref-filter: drop unused "obj" parameters
 + ref-filter: drop unused buf/sz pairs
 + files-backend: drop refs parameter from split_symref_update()
 + pack-objects: drop unused parameter from oe_map_new_pack()
 + merge-recursive: drop several unused parameters
 + diff: drop complete_rewrite parameter from run_external_diff()
 + diff: drop unused emit data parameter from sane_truncate_line()
 + diff: drop unused color reset parameters
 + diff: drop options parameter from diffcore_fix_diff_index()

 Code clean-up.

 Will merge to 'master'.


* jt/http-auth-proto-v2-fix (2019-03-03) 5 commits
  (merged to 'next' on 2019-03-03 at d0fdc53f3a)
 + remote-curl: use post_rpc() for protocol v2 also
 + remote-curl: refactor reading into rpc_state's buf
 + remote-curl: reduce scope of rpc_state.result
 + remote-curl: reduce scope of rpc_state.stdin_preamble
 + remote-curl: reduce scope of rpc_state.argv

 Unify RPC code for smart http in protocol v0/v1 and v2, which fixes
 a bug in the latter (lack of authentication retry) and generally
 improves the code base.

 Will merge to 'master'.


* en/merge-options-doc (2019-02-21) 1 commit
  (merged to 'next' on 2019-02-23 at 2eb5263dab)
 + merge-options.txt: correct wording of --no-commit option

 Doc update.

 Will merge to 'master'.


* ab/receive-pack-use-after-free-fix (2019-02-20) 1 commit
  (merged to 'next' on 2019-02-23 at 3f41dfe375)
 + receive-pack: fix use-after-free bug

 Memfix.

 Will merge to 'master'.


* nd/diff-parseopt-2 (2019-02-21) 21 commits
  (merged to 'next' on 2019-02-23 at 6f11d0af54)
 + diff-parseopt: convert --ignore-some-changes
 + diff-parseopt: convert --[no-]minimal
 + diff-parseopt: convert --relative
 + diff-parseopt: convert --no-renames|--[no--rename-empty
 + diff-parseopt: convert --find-copies-harder
 + diff-parseopt: convert -C|--find-copies
 + diff-parseopt: convert -D|--irreversible-delete
 + diff-parseopt: convert -M|--find-renames
 + diff-parseopt: convert -B|--break-rewrites
 + diff-parseopt: convert --output-*
 + diff-parseopt: convert --[no-]compact-summary
 + diff-parseopt: convert --stat*
 + diff-parseopt: convert -s|--no-patch
 + diff-parseopt: convert --name-status
 + diff-parseopt: convert --name-only
 + diff-parseopt: convert --patch-with-stat
 + diff-parseopt: convert --summary
 + diff-parseopt: convert --check
 + diff-parseopt: convert --dirstat and friends
 + diff-parseopt: convert --numstat and --shortstat
 + diff-parseopt: convert --patch-with-raw
 (this branch uses nd/diff-parseopt.)

 Second batch to teach the diff machinery to use the parse-options
 API.

 Will merge to 'master'.


* nd/completion-more-parameters (2019-02-20) 1 commit
  (merged to 'next' on 2019-02-23 at 23133710f7)
 + completion: add more parameter value completion

 The command line completion (in contrib/) has been taught to
 complete more subcommand parameters.

 Will merge to 'master'.


* nd/no-more-check-racy (2019-02-22) 1 commit
  (merged to 'next' on 2019-02-23 at eda76b8f46)
 + Delete check-racy.c

 Unused code removal.

 Will merge to 'master'.


* rd/doc-hook-used-in-sample (2019-02-21) 1 commit
  (merged to 'next' on 2019-02-23 at e521400a66)
 + mention use of "hooks.allownonascii" in "man githooks"

 Doc update.

 Will merge to 'master'.


* ab/makefile-help-devs-more (2019-02-24) 6 commits
 - Makefile: allow for combining DEVELOPER=1 and CFLAGS="..."
 - Makefile: move the setting of *FLAGS closer to "include"
 - Makefile: Move *_LIBS assignment into its own section
 - Makefile: add/remove comments at top and tweak whitespace
 - Makefile: move "strip" assignment down from flags
 - Makefile: remove an out-of-date comment

 CFLAGS now can be tweked when invoking Make while using
 DEVELOPER=YesPlease; this did not work well before.

 Will merge to 'next'.


* jt/fetch-cdn-offload (2019-03-01) 9 commits
 - fixup! upload-pack: refactor reading of pack-objects out
 - SQUASH???
 - upload-pack: send part of packfile response as uri
 - upload-pack: refactor reading of pack-objects out
 - Documentation: add Packfile URIs design doc
 - Documentation: order protocol v2 sections
 - http-fetch: support fetching packfiles by URL
 - http: improve documentation of http_pack_request
 - http: use --stdin and --keep when downloading pack

 WIP for allowing a response to "git fetch" to instruct the bulk of
 the pack contents to be instead taken from elsewhere (aka CDN).


* dl/submodule-set-branch (2019-02-08) 3 commits
 - submodule: teach set-branch subcommand
 - submodule--helper: teach config subcommand --unset
 - git-submodule.txt: "--branch <branch>" option defaults to 'master'

 "git submodule" learns "set-branch" subcommand that allows the
 submodule.*.branch settings to be modified.

 Need to attach sign-off; other than that it seems OK to be in 'next'.


* jc/test-yes-doc (2019-02-11) 1 commit
  (merged to 'next' on 2019-02-13 at cffac01759)
 + test: caution on our version of 'yes'

 Test doc update.

 Will merge to 'master'.


* nd/split-index-null-base-fix (2019-02-13) 1 commit
  (merged to 'next' on 2019-02-13 at c404a19b7a)
 + read-cache.c: fix writing "link" index ext with null base oid

 Split-index fix.

 Will merge to 'master'.


* rj/prune-packed-excess-args (2019-02-11) 1 commit
  (merged to 'next' on 2019-02-13 at e026a2e7a7)
 + prune-packed: check for too many arguments

 "git prune-packed" did not notice and complain against excess
 arguments given from the command line, which now it does.

 Will merge to 'master'.


* js/doc-symref-in-proto-v1 (2019-02-21) 1 commit
  (merged to 'next' on 2019-02-21 at c7ca3bb974)
 + protocol-capabilities.txt: document symref

 Doc update.

 Will merge to 'master'.


* dl/complete-submodule-absorbgitdirs (2019-02-06) 1 commit
  (merged to 'next' on 2019-02-06 at c4e0cd535a)
 + completion: complete git submodule absorbgitdirs

 Command-line completion (in contrib/) learned to tab-complete the
 "git submodule absorbgitdirs" subcommand.

 Will merge to 'master'.


* dm/some-stdio-functions-are-macro-on-freebsd (2019-02-01) 1 commit
 - http: cast result to FILE *

 Variants of BSD define fileno(fh) as a macro, breaking a program
 that passes a "void *" to it.

 Expecting a reroll.
 cf. <49B9198C-53E5-42BD-8834-B1EDEB3332CB@usask.ca>


* en/combined-all-paths (2019-02-07) 1 commit
  (merged to 'next' on 2019-02-08 at 7057f38d6e)
 + log,diff-tree: add --combined-all-paths option

 Output from "diff --cc" did not show the original paths when the
 merge involved renames.  A new option adds the paths in the
 original trees to the output.

 Will merge to 'master'.


* ds/commit-graph-format-v2 (2019-01-29) 8 commits
 - SQUASH : misnamed variables and style fix
 - commit-graph: test verifying a corrupt v2 header
 - commit-graph: implement file format version 2
 - commit-graph: add --version=<n> option
 - commit-graph: create new version flags
 - commit-graph: collapse parameters into flags
 - commit-graph: return with errors during write
 - Merge branch 'bc/sha-256' into ds/commit-graph-format-v2

 Introduce version 2 of the commit-graph format to correct
 deficiency in the initial version.

 Needs update before merging to 'next'.


* jh/trace2 (2019-02-22) 15 commits
  (merged to 'next' on 2019-02-22 at 4c84c621fe)
 + trace2: add for_each macros to clang-format
 + trace2: t/helper/test-trace2, t0210.sh, t0211.sh, t0212.sh
 + trace2:data: add subverb for rebase
 + trace2:data: add subverb to reset command
 + trace2:data: add subverb to checkout command
 + trace2:data: pack-objects: add trace2 regions
 + trace2:data: add trace2 instrumentation to index read/write
 + trace2:data: add trace2 hook classification
 + trace2:data: add trace2 transport child classification
 + trace2:data: add trace2 sub-process classification
 + trace2:data: add editor/pager child classification
 + trace2:data: add trace2 regions to wt-status
 + trace2: collect Windows-specific process information
 + trace2: create new combined trace facility
 + trace2: Documentation/technical/api-trace2.txt

 A more structured way to obtain execution trace has been added.

 Will merge to 'master'.


* sx/evolve (2019-02-15) 8 commits
 . evolve: add the git change list command
 . evolve: implement the git change command
 . evolve: add support for writing metacommits
 . evolve: add the change-table structure
 . evolve: add support for parsing metacommits
 . ref-filter: add the metas namespace to ref-filter
 . sha1-array: implement oid_array_readonly_contains
 . technical doc: add a design doc for the evolve command

 The beginning of "hg evolve" mimicry.


* br/blame-ignore (2019-02-13) 6 commits
 - SQUASH???
 - blame: add tests for ignoring revisions
 - blame: add a config option to mark ignored lines
 - blame: add the ability to ignore commits and their changes
 - blame: use a helper function in blame_chunk()
 - Move init_skiplist() outside of fsck

 "git blame" learned to "ignore" commits in the history, whose
 effects (as well as their presence) get ignored.

 Needs update before merging to 'next'.


* nd/diff-parseopt (2019-01-27) 14 commits
  (merged to 'next' on 2019-02-05 at 7c4b79aa79)
 + diff.c: convert --raw
 + diff.c: convert -W|--[no-]function-context
 + diff.c: convert -U|--unified
 + diff.c: convert -u|-p|--patch
 + diff.c: prepare to use parse_options() for parsing
 + diff.h: avoid bit fields in struct diff_flags
 + diff.h: keep forward struct declarations sorted
 + parse-options: allow ll_callback with OPTION_CALLBACK
 + parse-options: avoid magic return codes
 + parse-options: stop abusing 'callback' for lowlevel callbacks
 + parse-options: add OPT_BITOP()
 + parse-options: disable option abbreviation with PARSE_OPT_KEEP_UNKNOWN
 + parse-options: add one-shot mode
 + parse-options.h: remove extern on function prototypes
 (this branch is used by nd/diff-parseopt-2.)

 The diff machinery, one of the oldest parts of the system, which
 long predates the parse-options API, uses fairly long and complex
 handcrafted option parser.  This is being rewritten to use the
 parse-options API.

 Will merge to 'master'.


* sc/pack-redundant (2019-02-04) 6 commits
  (merged to 'next' on 2019-02-08 at ba3f8f0bc0)
 + pack-redundant: consistent sort method
 + pack-redundant: rename pack_list.all_objects
 + pack-redundant: new algorithm to find min packs
 + pack-redundant: delete redundant code
 + pack-redundant: delay creation of unique_objects
 + t5323: test cases for git-pack-redundant

 Update the implementation of pack-redundant for performance in a
 repository with many packfiles.

 Will merge to 'master'.


* nd/config-move-to (2019-01-14) 7 commits
 - config.h: fix hdr-check warnings
 - config: add --move-to
 - config: factor out set_config_source_file()
 - config: use OPT_FILENAME()
 - config.c: add repo_config_set_worktree_gently()
 - worktree.c: add get_worktree_config()
 - config.c: avoid git_path() in do_git_config_sequence()

 Needs review.


* ma/clear-repository-format (2019-03-01) 2 commits
 - setup: fix memory leaks with `struct repository_format`
 - setup: free old value before setting `work_tree`

 The setup code has been cleaned up to avoid leaks around the
 repository_format structure.

 Will merge to 'next'.


* wh/author-committer-ident-config (2019-02-04) 1 commit
  (merged to 'next' on 2019-02-06 at 6ab8bfa199)
 + config: allow giving separate author and committer idents

 Four new configuration variables {author,committer}.{name,email}
 have been introduced to override user.{name,email} in more specific
 cases.

 Will merge to 'master'.


* tg/checkout-no-overlay (2019-02-04) 9 commits
  (merged to 'next' on 2019-02-04 at 9968bcf4fb)
 + revert "checkout: introduce checkout.overlayMode config"
  (merged to 'next' on 2019-01-18 at 1e2a79ba5c)
 + checkout: introduce checkout.overlayMode config
 + checkout: introduce --{,no-}overlay option
 + checkout: factor out mark_cache_entry_for_checkout function
 + checkout: clarify comment
 + read-cache: add invalidate parameter to remove_marked_cache_entries
 + entry: support CE_WT_REMOVE flag in checkout_entry
 + entry: factor out unlink_entry function
 + move worktree tests to t24*

 "git checkout --no-overlay" can be used to trigger a new mode of
 checking out paths out of the tree-ish, that allows paths that
 match the pathspec that are in the current index and working tree
 and are not in the tree-ish.

 Will hold.
 Waiting for "restore-files" & "switch-branches" pair.
 cf. <20190205204208.GC6085@hank.intra.tgummerer.com>


* dl/merge-cleanup-scissors-fix (2019-01-27) 4 commits
  (merged to 'next' on 2019-02-06 at f4fe5d759a)
 + merge: add scissors line on merge conflict
 + merge: cleanup messages like commit
 + t7600: clean up 'merge --squash c3 with c7' test
 + commit: extract cleanup_mode functions to sequencer

 The list of conflicted paths shown in the editor while concluding a
 conflicted merge was shown above the scissors line when the
 clean-up mode is set to "scissors", even though it was commented
 out just like the list of updated paths and other information to
 help the user explain the merge better.

 Will merge to 'master'.


* aw/pretty-trailers (2019-01-29) 7 commits
  (merged to 'next' on 2019-02-06 at b7e5437702)
 + pretty: add support for separator option in %(trailers)
 + strbuf: separate callback for strbuf_expand:ing literals
 + pretty: add support for "valueonly" option in %(trailers)
 + pretty: allow showing specific trailers
 + pretty: single return path in %(trailers) handling
 + pretty: allow %(trailers) options with explicit value
 + doc: group pretty-format.txt placeholders descriptions

 The %(trailers) formatter in "git log --format=..."  now allows to
 optionally pick trailers selectively by keyword, show only values,
 etc.

 Will merge to 'master'.


* jn/unknown-index-extensions (2018-11-21) 2 commits
 - index: offer advice for unknown index extensions
 - index: do not warn about unrecognized extensions

 A bit too alarming warning given when unknown index extensions
 exist is getting revamped.

 Expecting a reroll.


* du/branch-show-current (2018-10-26) 1 commit
  (merged to 'next' on 2019-02-08 at e662ed4aee)
 + branch: introduce --show-current display option

 "git branch" learned a new subcommand "--show-current".

 Will merge to 'master'.


* ag/sequencer-reduce-rewriting-todo (2019-01-29) 16 commits
 - rebase--interactive: move transform_todo_file() to rebase--interactive.c
 - sequencer: use edit_todo_list() in complete_action()
 - rebase-interactive: rewrite edit_todo_list() to handle the initial edit
 - rebase-interactive: append_todo_help() changes
 - rebase-interactive: use todo_list_write_to_file() in edit_todo_list()
 - sequencer: refactor skip_unnecessary_picks() to work on a todo_list
 - sequencer: change complete_action() to use the refactored functions
 - sequencer: make sequencer_make_script() write its script to a strbuf
 - sequencer: refactor rearrange_squash() to work on a todo_list
 - sequencer: refactor sequencer_add_exec_commands() to work on a todo_list
 - sequencer: refactor check_todo_list() to work on a todo_list
 - sequencer: introduce todo_list_write_to_file()
 - sequencer: refactor transform_todos() to work on a todo_list
 - sequencer: remove the 'arg' field from todo_item
 - sequencer: make the todo_list structure public
 - sequencer: changes in parse_insn_buffer()

 The scripted version of "git rebase -i" wrote and rewrote the todo
 list many times during a single step of its operation, and the
 recent C-rewrite made a faithful conversion of the logic to C.  The
 implementation has been updated to carry necessary information
 around in-core to avoid rewriting the same file over and over
 unnecessarily.

 Need to pick up a newer version.


* js/add-i-coalesce-after-editing-hunk (2018-08-28) 1 commit
 - add -p: coalesce hunks before testing applicability

 Applicability check after a patch is edited in a "git add -i/p"
 session has been improved.

 Will hold.
 cf. <e5b2900a-0558-d3bf-8ea1-d526b078bbc2@talktalk.net>


* ps/stash-in-c (2019-03-01) 28 commits
 - tests: add a special setup where stash.useBuiltin is off
 - stash: optionally use the scripted version again
 - stash: add back the original, scripted `git stash`
 - stash: convert `stash--helper.c` into `stash.c`
 - stash: replace all `write-tree` child processes with API calls
 - stash: optimize `get_untracked_files()` and `check_changes()`
 - stash: convert save to builtin
 - stash: make push -q quiet
 - stash: convert push to builtin
 - stash: convert create to builtin
 - stash: convert store to builtin
 - stash: convert show to builtin
 - stash: convert list to builtin
 - stash: convert pop to builtin
 - stash: convert branch to builtin
 - stash: convert drop and clear to builtin
 - stash: convert apply to builtin
 - stash: mention options in `show` synopsis
 - stash: add tests for `git stash show` config
 - stash: rename test cases to be more descriptive
 - t3903: add test for --intent-to-add file
 - t3903: modernize style
 - stash: improve option parsing test coverage
 - ident: add the ability to provide a "fallback identity"
 - strbuf.c: add `strbuf_insertf()` and `strbuf_vinsertf()`
 - strbuf.c: add `strbuf_join_argv()`
 - sha1-name.c: add `get_oidf()` which acts like `get_oid()`
 - Merge branch 'sd/stash-wo-user-name'

 "git stash" rewritten in C.

 Will merge to 'next'.


* pw/add-p-select (2018-07-26) 4 commits
 - add -p: optimize line selection for short hunks
 - add -p: allow line selection to be inverted
 - add -p: select modified lines correctly
 - add -p: select individual hunk lines

 "git add -p" interactive interface learned to let users choose
 individual added/removed lines to be used in the operation, instead
 of accepting or rejecting a whole hunk.

 Will discard.
 No further feedbacks on the topic for quite some time.

 cf. <d622a95b-7302-43d4-4ec9-b2cf3388c653@talktalk.net>
 I found the feature to be hard to explain, and may result in more
 end-user complaints, but let's see.

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

* Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)
  2019-03-06  1:34 What's cooking in git.git (Mar 2019, #01; Wed, 6) Junio C Hamano
@ 2019-03-06  1:41 ` Denton Liu
  2019-03-06 23:43   ` Junio C Hamano
  2019-03-06  4:43 ` Jeff King
                   ` (6 subsequent siblings)
  7 siblings, 1 reply; 31+ messages in thread
From: Denton Liu @ 2019-03-06  1:41 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

On Wed, Mar 06, 2019 at 10:34:18AM +0900, Junio C Hamano wrote:
> * dl/merge-cleanup-scissors-fix (2019-01-27) 4 commits
>   (merged to 'next' on 2019-02-06 at f4fe5d759a)
>  + merge: add scissors line on merge conflict
>  + merge: cleanup messages like commit
>  + t7600: clean up 'merge --squash c3 with c7' test
>  + commit: extract cleanup_mode functions to sequencer
> 
>  The list of conflicted paths shown in the editor while concluding a
>  conflicted merge was shown above the scissors line when the
>  clean-up mode is set to "scissors", even though it was commented
>  out just like the list of updated paths and other information to
>  help the user explain the merge better.
> 
>  Will merge to 'master'.

I just noticed I missed some stuff with this change today. If a conflict
happens when we're doing git revert, then the cut line ends up below the
list of conflicts.

It's safe to merge to master but it'd probably be better if we keep
cooking in next until I can get the fixup patches out.

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

* Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)
  2019-03-06  1:34 What's cooking in git.git (Mar 2019, #01; Wed, 6) Junio C Hamano
  2019-03-06  1:41 ` Denton Liu
@ 2019-03-06  4:43 ` Jeff King
  2019-03-06 23:45   ` Junio C Hamano
  2019-03-06  9:44 ` Duy Nguyen
                   ` (5 subsequent siblings)
  7 siblings, 1 reply; 31+ messages in thread
From: Jeff King @ 2019-03-06  4:43 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

On Wed, Mar 06, 2019 at 10:34:18AM +0900, Junio C Hamano wrote:

> * jk/fsck-doc (2019-03-05) 2 commits
>  - fsck: always compute USED flags for unreachable objects
>  - doc/fsck: clarify --connectivity-only behavior
> 
>  "git fsck --connectivity-only" omits computation necessary to sift
>  the objects that are not reachable from any of the refs into
>  unreachable and dangling.  This is now documented, and also the
>  computation is done in order to show the dangling objects when
>  requested (which is done by default, but can be overridden with
>  the "--no-dangling" option).
> 
>  Will merge to 'next'.

I think this merge message needs a slight tweak with this v2; we don't
document the failing now, but instead just fix it. :) Maybe:

	"git fsck --connectivity-only" omits computation necessary to sift
	the objects that are not reachable from any of the refs into
	unreachable and dangling.  This is now enabled when dangling
	objects are requested (which is done by default, but can be
	overridden with the "--no-dangling" option).

-Peff

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

* Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)
  2019-03-06  1:34 What's cooking in git.git (Mar 2019, #01; Wed, 6) Junio C Hamano
  2019-03-06  1:41 ` Denton Liu
  2019-03-06  4:43 ` Jeff King
@ 2019-03-06  9:44 ` Duy Nguyen
  2019-03-06 23:46   ` Junio C Hamano
  2019-03-07 12:34   ` Philip Oakley
  2019-03-06 12:39 ` Johannes Schindelin
                   ` (4 subsequent siblings)
  7 siblings, 2 replies; 31+ messages in thread
From: Duy Nguyen @ 2019-03-06  9:44 UTC (permalink / raw)
  To: Junio C Hamano, Thomas Gummerer; +Cc: Git Mailing List

On Wed, Mar 6, 2019 at 8:34 AM Junio C Hamano <gitster@pobox.com> wrote:
> * tg/checkout-no-overlay (2019-02-04) 9 commits
>   (merged to 'next' on 2019-02-04 at 9968bcf4fb)
>  + revert "checkout: introduce checkout.overlayMode config"
>   (merged to 'next' on 2019-01-18 at 1e2a79ba5c)
>  + checkout: introduce checkout.overlayMode config
>  + checkout: introduce --{,no-}overlay option
>  + checkout: factor out mark_cache_entry_for_checkout function
>  + checkout: clarify comment
>  + read-cache: add invalidate parameter to remove_marked_cache_entries
>  + entry: support CE_WT_REMOVE flag in checkout_entry
>  + entry: factor out unlink_entry function
>  + move worktree tests to t24*
>
>  "git checkout --no-overlay" can be used to trigger a new mode of
>  checking out paths out of the tree-ish, that allows paths that
>  match the pathspec that are in the current index and working tree
>  and are not in the tree-ish.
>
>  Will hold.
>  Waiting for "restore-files" & "switch-branches" pair.
>  cf. <20190205204208.GC6085@hank.intra.tgummerer.com>

If it's ready for master, I'd love to see it merged. Either that or
topic is rebased on 'master'. There are separate checkout changes in
'master' (mine, sadly), and because switch/restore moves lots of code
around, I need to create a merge of this topic and master as the base,
or you'll get horrible conflicts.

I should send switch/restore again soon. There are still a few
unaddressed concerns for git-restore since last time. Probably time to
refresh those discussions.
-- 
Duy

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

* Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)
  2019-03-06  1:34 What's cooking in git.git (Mar 2019, #01; Wed, 6) Junio C Hamano
                   ` (2 preceding siblings ...)
  2019-03-06  9:44 ` Duy Nguyen
@ 2019-03-06 12:39 ` Johannes Schindelin
  2019-03-18  7:08   ` Junio C Hamano
  2019-03-06 12:47 ` Johannes Schindelin
                   ` (3 subsequent siblings)
  7 siblings, 1 reply; 31+ messages in thread
From: Johannes Schindelin @ 2019-03-06 12:39 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

Hi Junio,

On Wed, 6 Mar 2019, Junio C Hamano wrote:

> * js/rebase-orig-head-fix (2019-03-04) 4 commits
>  - built-in rebase: set ORIG_HEAD just once, before the rebase
>  - built-in rebase: demonstrate that ORIG_HEAD is not set correctly
>  - built-in rebase: use the correct reflog when switching branches
>  - built-in rebase: no need to check out `onto` twice
> 
>  "gir rebase" that was reimplemented in C did not set ORIG_HEAD

s/gir/git/ (assuming that you use these descriptions to generate the
announcement mails?)

Ciao,
Dscho

>  correctly, which has been corrected.
> 
>  Will merge to 'next'.
> 
> 

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

* Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)
  2019-03-06  1:34 What's cooking in git.git (Mar 2019, #01; Wed, 6) Junio C Hamano
                   ` (3 preceding siblings ...)
  2019-03-06 12:39 ` Johannes Schindelin
@ 2019-03-06 12:47 ` Johannes Schindelin
  2019-03-06 23:55   ` Junio C Hamano
  2019-03-06 13:26 ` Johannes Schindelin
                   ` (2 subsequent siblings)
  7 siblings, 1 reply; 31+ messages in thread
From: Johannes Schindelin @ 2019-03-06 12:47 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

Hi Junio,

On Wed, 6 Mar 2019, Junio C Hamano wrote:

> * nb/branch-show-other-worktrees-head (2019-02-01) 3 commits
>  - branch: add an extra verbose output displaying worktree path for refs checked out in a linked worktree
>  - branch: mark and color a branch differently if it is checked out in a linked worktree
>  - ref-filter: add worktreepath atom
> 
>  "git branch --list" learned to show branches that are checked out
>  in other worktrees connected to the same repository prefixed with
>  '+', similar to the way the currently checked out branch is shown
>  with '*' in front.
> 
>  The top one probably deserves retitling.
>  The second one is of dubious value.

As somebody who likes color [*1*], and who has *dozens* of worktrees, I
would really like this to hit an offical version, including the second
patch.

Ciao,
Dscho

Footnote *1*: I am a big fan of *all* colors for *everyone*, e.g.
https://timewithlyme.wordpress.com/2016/06/27/pink-is-for-everyone/

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

* Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)
  2019-03-06  1:34 What's cooking in git.git (Mar 2019, #01; Wed, 6) Junio C Hamano
                   ` (4 preceding siblings ...)
  2019-03-06 12:47 ` Johannes Schindelin
@ 2019-03-06 13:26 ` Johannes Schindelin
  2019-03-06 13:41 ` ps/stash-in-c, was " Johannes Schindelin
  2019-03-06 18:10 ` Jonathan Tan
  7 siblings, 0 replies; 31+ messages in thread
From: Johannes Schindelin @ 2019-03-06 13:26 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

Hi Junio,

On Wed, 6 Mar 2019, Junio C Hamano wrote:

> * ab/makefile-help-devs-more (2019-02-24) 6 commits
>  - Makefile: allow for combining DEVELOPER=1 and CFLAGS="..."
>  - Makefile: move the setting of *FLAGS closer to "include"
>  - Makefile: Move *_LIBS assignment into its own section
>  - Makefile: add/remove comments at top and tweak whitespace
>  - Makefile: move "strip" assignment down from flags
>  - Makefile: remove an out-of-date comment
> 
>  CFLAGS now can be tweked when invoking Make while using
>  DEVELOPER=YesPlease; this did not work well before.
> 
>  Will merge to 'next'.

s/tweked/tweaked/ (again, assuming that you'll reuse this description in
the next announcement mail).

Ciao,
Dscho

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

* ps/stash-in-c, was Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)
  2019-03-06  1:34 What's cooking in git.git (Mar 2019, #01; Wed, 6) Junio C Hamano
                   ` (5 preceding siblings ...)
  2019-03-06 13:26 ` Johannes Schindelin
@ 2019-03-06 13:41 ` Johannes Schindelin
  2019-03-06 23:56   ` Junio C Hamano
  2019-03-06 18:10 ` Jonathan Tan
  7 siblings, 1 reply; 31+ messages in thread
From: Johannes Schindelin @ 2019-03-06 13:41 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

Hi Junio,

On Wed, 6 Mar 2019, Junio C Hamano wrote:

> * ps/stash-in-c (2019-03-01) 28 commits
>  - tests: add a special setup where stash.useBuiltin is off
>  - stash: optionally use the scripted version again
>  - stash: add back the original, scripted `git stash`
>  - stash: convert `stash--helper.c` into `stash.c`
>  - stash: replace all `write-tree` child processes with API calls
>  - stash: optimize `get_untracked_files()` and `check_changes()`
>  - stash: convert save to builtin
>  - stash: make push -q quiet
>  - stash: convert push to builtin
>  - stash: convert create to builtin
>  - stash: convert store to builtin
>  - stash: convert show to builtin
>  - stash: convert list to builtin
>  - stash: convert pop to builtin
>  - stash: convert branch to builtin
>  - stash: convert drop and clear to builtin
>  - stash: convert apply to builtin
>  - stash: mention options in `show` synopsis
>  - stash: add tests for `git stash show` config
>  - stash: rename test cases to be more descriptive
>  - t3903: add test for --intent-to-add file
>  - t3903: modernize style
>  - stash: improve option parsing test coverage
>  - ident: add the ability to provide a "fallback identity"
>  - strbuf.c: add `strbuf_insertf()` and `strbuf_vinsertf()`
>  - strbuf.c: add `strbuf_join_argv()`
>  - sha1-name.c: add `get_oidf()` which acts like `get_oid()`
>  - Merge branch 'sd/stash-wo-user-name'
> 
>  "git stash" rewritten in C.
> 
>  Will merge to 'next'.

Yes, yes, yes!

Thank you so much!
Dscho

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

* Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)
  2019-03-06  1:34 What's cooking in git.git (Mar 2019, #01; Wed, 6) Junio C Hamano
                   ` (6 preceding siblings ...)
  2019-03-06 13:41 ` ps/stash-in-c, was " Johannes Schindelin
@ 2019-03-06 18:10 ` Jonathan Tan
  2019-03-07  0:19   ` Junio C Hamano
  7 siblings, 1 reply; 31+ messages in thread
From: Jonathan Tan @ 2019-03-06 18:10 UTC (permalink / raw)
  To: gitster; +Cc: git, Jonathan Tan

> * jt/test-protocol-version (2019-02-06) 8 commits
>  - t5552: compensate for v2 filtering ref adv.
>  - tests: fix protocol version for overspecifications
>  - t5700: only run with protocol version 1
>  - t5512: compensate for v0 only sending HEAD symrefs
>  - t5503: fix overspecification of trace expectation
>  - tests: always test fetch of unreachable with v0
>  - tests: define GIT_TEST_PROTOCOL_VERSION
>  - Merge branch 'js/protocol-advertise-multi' into jt/test-protocol-version
>  (this branch uses js/protocol-advertise-multi.)
> 
>  Help developers by making it easier to run most of the tests under
>  different versions of over-the-wire protocols.
> 
>  Blocked by js/protocol-advertise-multi

I sent out a new version, on master, that avoids the block:

https://public-inbox.org/git/cover.1551131153.git.jonathantanmy@google.com/

It is mostly the same except with one new patch.

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

* Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)
  2019-03-06  1:41 ` Denton Liu
@ 2019-03-06 23:43   ` Junio C Hamano
  0 siblings, 0 replies; 31+ messages in thread
From: Junio C Hamano @ 2019-03-06 23:43 UTC (permalink / raw)
  To: Denton Liu; +Cc: git

Denton Liu <liu.denton@gmail.com> writes:

> It's safe to merge to master but it'd probably be better if we keep
> cooking in next until I can get the fixup patches out.

OK.  Or we could kick it out of 'next' and replace with an updated
series instead of "start with broken patches, with fixup on top".

Thanks.

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

* Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)
  2019-03-06  4:43 ` Jeff King
@ 2019-03-06 23:45   ` Junio C Hamano
  0 siblings, 0 replies; 31+ messages in thread
From: Junio C Hamano @ 2019-03-06 23:45 UTC (permalink / raw)
  To: Jeff King; +Cc: git

Jeff King <peff@peff.net> writes:

> I think this merge message needs a slight tweak with this v2; we don't
> document the failing now, but instead just fix it.

True. Thanks.

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

* Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)
  2019-03-06  9:44 ` Duy Nguyen
@ 2019-03-06 23:46   ` Junio C Hamano
  2019-03-07 12:34   ` Philip Oakley
  1 sibling, 0 replies; 31+ messages in thread
From: Junio C Hamano @ 2019-03-06 23:46 UTC (permalink / raw)
  To: Duy Nguyen; +Cc: Thomas Gummerer, Git Mailing List

Duy Nguyen <pclouds@gmail.com> writes:

> On Wed, Mar 6, 2019 at 8:34 AM Junio C Hamano <gitster@pobox.com> wrote:
>> * tg/checkout-no-overlay (2019-02-04) 9 commits
>>   (merged to 'next' on 2019-02-04 at 9968bcf4fb)
>>  Will hold.
>
> If it's ready for master, I'd love to see it merged. Either that or
> topic is rebased on 'master'. There are separate checkout changes in
> 'master' (mine, sadly), and because switch/restore moves lots of code
> around, I need to create a merge of this topic and master as the base,
> or you'll get horrible conflicts.

Yeah, that would make it easier for me ;-)

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

* Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)
  2019-03-06 12:47 ` Johannes Schindelin
@ 2019-03-06 23:55   ` Junio C Hamano
  0 siblings, 0 replies; 31+ messages in thread
From: Junio C Hamano @ 2019-03-06 23:55 UTC (permalink / raw)
  To: Johannes Schindelin; +Cc: git

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Hi Junio,
>
> On Wed, 6 Mar 2019, Junio C Hamano wrote:
>
>> * nb/branch-show-other-worktrees-head (2019-02-01) 3 commits
>>  - branch: add an extra verbose output displaying worktree path for refs checked out in a linked worktree
>>  - branch: mark and color a branch differently if it is checked out in a linked worktree
>>  - ref-filter: add worktreepath atom
>> 
>>  "git branch --list" learned to show branches that are checked out
>>  in other worktrees connected to the same repository prefixed with
>>  '+', similar to the way the currently checked out branch is shown
>>  with '*' in front.
>> 
>>  The top one probably deserves retitling.
>>  The second one is of dubious value.
>
> As somebody who likes color [*1*], and who has *dozens* of worktrees, I
> would really like this to hit an offical version, including the second
> patch.

It's "meh" to me, in the sense that I do not have strong feeling
against (or for) the extra coloring.  In either case, these are
not ready as-is anyway, so...

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

* Re: ps/stash-in-c, was Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)
  2019-03-06 13:41 ` ps/stash-in-c, was " Johannes Schindelin
@ 2019-03-06 23:56   ` Junio C Hamano
  0 siblings, 0 replies; 31+ messages in thread
From: Junio C Hamano @ 2019-03-06 23:56 UTC (permalink / raw)
  To: Johannes Schindelin; +Cc: git

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Hi Junio,
>
> On Wed, 6 Mar 2019, Junio C Hamano wrote:
>
>> * ps/stash-in-c (2019-03-01) 28 commits
>> ...
>> 
>>  "git stash" rewritten in C.
>> 
>>  Will merge to 'next'.
>
> Yes, yes, yes!
>
> Thank you so much!

Not "me", but all those who worked on whipping the topic into shape
;-)

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

* Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)
  2019-03-06 18:10 ` Jonathan Tan
@ 2019-03-07  0:19   ` Junio C Hamano
  0 siblings, 0 replies; 31+ messages in thread
From: Junio C Hamano @ 2019-03-07  0:19 UTC (permalink / raw)
  To: Jonathan Tan; +Cc: git

Jonathan Tan <jonathantanmy@google.com> writes:

>> * jt/test-protocol-version (2019-02-06) 8 commits
>>  - t5552: compensate for v2 filtering ref adv.
>>  - tests: fix protocol version for overspecifications
>>  - t5700: only run with protocol version 1
>>  - t5512: compensate for v0 only sending HEAD symrefs
>>  - t5503: fix overspecification of trace expectation
>>  - tests: always test fetch of unreachable with v0
>>  - tests: define GIT_TEST_PROTOCOL_VERSION
>>  - Merge branch 'js/protocol-advertise-multi' into jt/test-protocol-version
>>  (this branch uses js/protocol-advertise-multi.)
>> 
>>  Help developers by making it easier to run most of the tests under
>>  different versions of over-the-wire protocols.
>> 
>>  Blocked by js/protocol-advertise-multi
>
> I sent out a new version, on master, that avoids the block:
>
> https://public-inbox.org/git/cover.1551131153.git.jonathantanmy@google.com/
>
> It is mostly the same except with one new patch.

Thanks.

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

* Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)
  2019-03-06  9:44 ` Duy Nguyen
  2019-03-06 23:46   ` Junio C Hamano
@ 2019-03-07 12:34   ` Philip Oakley
  2019-03-07 12:54     ` Duy Nguyen
  2019-03-08  0:02     ` What's cooking in git.git (Mar 2019, #01; Wed, 6) Junio C Hamano
  1 sibling, 2 replies; 31+ messages in thread
From: Philip Oakley @ 2019-03-07 12:34 UTC (permalink / raw)
  To: Duy Nguyen, Junio C Hamano, Thomas Gummerer; +Cc: Git Mailing List

On 06/03/2019 09:44, Duy Nguyen wrote:
> On Wed, Mar 6, 2019 at 8:34 AM Junio C Hamano <gitster@pobox.com> wrote:
>> * tg/checkout-no-overlay (2019-02-04) 9 commits
>>    (merged to 'next' on 2019-02-04 at 9968bcf4fb)
>>   + revert "checkout: introduce checkout.overlayMode config"
>>    (merged to 'next' on 2019-01-18 at 1e2a79ba5c)
>>   + checkout: introduce checkout.overlayMode config
>>   + checkout: introduce --{,no-}overlay option
>>   + checkout: factor out mark_cache_entry_for_checkout function
>>   + checkout: clarify comment
>>   + read-cache: add invalidate parameter to remove_marked_cache_entries
>>   + entry: support CE_WT_REMOVE flag in checkout_entry
>>   + entry: factor out unlink_entry function
>>   + move worktree tests to t24*
>>
>>   "git checkout --no-overlay" can be used to trigger a new mode of
>>   checking out paths out of the tree-ish, that allows paths that
>>   match the pathspec that are in the current index and working tree
>>   and are not in the tree-ish.
>>
>>   Will hold.
>>   Waiting for "restore-files" & "switch-branches" pair.
>>   cf. <20190205204208.GC6085@hank.intra.tgummerer.com>
> If it's ready for master, I'd love to see it merged. Either that or
> topic is rebased on 'master'. There are separate checkout changes in
> 'master' (mine, sadly), and because switch/restore moves lots of code
> around, I need to create a merge of this topic and master as the base,
> or you'll get horrible conflicts.
>
> I should send switch/restore again soon. There are still a few
> unaddressed concerns for git-restore since last time. Probably time to
> refresh those discussions.

Just catching up on back emails:

The one point I noted is that "Overlay" is a new magic term without any 
explanation within the _documentation_.

It would appear worth it to also add something (follow up patch?) to the 
e.g. git glossary to clarify how overlay differs, or is similar to, the 
different merge and reset modes.

--

Philip


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

* Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)
  2019-03-07 12:34   ` Philip Oakley
@ 2019-03-07 12:54     ` Duy Nguyen
  2019-03-09 17:27       ` Thomas Gummerer
  2019-03-08  0:02     ` What's cooking in git.git (Mar 2019, #01; Wed, 6) Junio C Hamano
  1 sibling, 1 reply; 31+ messages in thread
From: Duy Nguyen @ 2019-03-07 12:54 UTC (permalink / raw)
  To: Philip Oakley
  Cc: Junio C Hamano, Thomas Gummerer, Git Mailing List, Jonathan Nieder

On Thu, Mar 7, 2019 at 7:34 PM Philip Oakley <philipoakley@iee.org> wrote:
>
> On 06/03/2019 09:44, Duy Nguyen wrote:
> > On Wed, Mar 6, 2019 at 8:34 AM Junio C Hamano <gitster@pobox.com> wrote:
> >> * tg/checkout-no-overlay (2019-02-04) 9 commits
> >>    (merged to 'next' on 2019-02-04 at 9968bcf4fb)
> >>   + revert "checkout: introduce checkout.overlayMode config"
> >>    (merged to 'next' on 2019-01-18 at 1e2a79ba5c)
> >>   + checkout: introduce checkout.overlayMode config
> >>   + checkout: introduce --{,no-}overlay option
> >>   + checkout: factor out mark_cache_entry_for_checkout function
> >>   + checkout: clarify comment
> >>   + read-cache: add invalidate parameter to remove_marked_cache_entries
> >>   + entry: support CE_WT_REMOVE flag in checkout_entry
> >>   + entry: factor out unlink_entry function
> >>   + move worktree tests to t24*
> >>
> >>   "git checkout --no-overlay" can be used to trigger a new mode of
> >>   checking out paths out of the tree-ish, that allows paths that
> >>   match the pathspec that are in the current index and working tree
> >>   and are not in the tree-ish.
> >>
> >>   Will hold.
> >>   Waiting for "restore-files" & "switch-branches" pair.
> >>   cf. <20190205204208.GC6085@hank.intra.tgummerer.com>
> > If it's ready for master, I'd love to see it merged. Either that or
> > topic is rebased on 'master'. There are separate checkout changes in
> > 'master' (mine, sadly), and because switch/restore moves lots of code
> > around, I need to create a merge of this topic and master as the base,
> > or you'll get horrible conflicts.
> >
> > I should send switch/restore again soon. There are still a few
> > unaddressed concerns for git-restore since last time. Probably time to
> > refresh those discussions.
>
> Just catching up on back emails:
>
> The one point I noted is that "Overlay" is a new magic term without any
> explanation within the _documentation_.
>
> It would appear worth it to also add something (follow up patch?) to the
> e.g. git glossary to clarify how overlay differs, or is similar to, the
> different merge and reset modes.

I think Jonathan questions the name "overlay" too. Since this is
similar to "cp -R" mode, another suggestion is --copy-mode.
-- 
Duy

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

* Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)
  2019-03-07 12:34   ` Philip Oakley
  2019-03-07 12:54     ` Duy Nguyen
@ 2019-03-08  0:02     ` Junio C Hamano
  1 sibling, 0 replies; 31+ messages in thread
From: Junio C Hamano @ 2019-03-08  0:02 UTC (permalink / raw)
  To: Philip Oakley; +Cc: Duy Nguyen, Thomas Gummerer, Git Mailing List

Philip Oakley <philipoakley@iee.org> writes:

>> I should send switch/restore again soon. There are still a few
>> unaddressed concerns for git-restore since last time. Probably time to
>> refresh those discussions.
>
> Just catching up on back emails:
>
> The one point I noted is that "Overlay" is a new magic term without
> any explanation within the _documentation_.
>
> It would appear worth it to also add something (follow up patch?) to
> the e.g. git glossary to clarify how overlay differs, or is similar
> to, the different merge and reset modes.

Yeah, I recall that.  I was hoping that it would stop mattering when
we start using switch-branches and restore-paths, but of course it
would not hurt to clarify the doc in the meantime.


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

* Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)
  2019-03-07 12:54     ` Duy Nguyen
@ 2019-03-09 17:27       ` Thomas Gummerer
  2019-03-09 18:04         ` Elijah Newren
  2019-03-12 23:30         ` [PATCH v2] glossary: add definition for overlay Thomas Gummerer
  0 siblings, 2 replies; 31+ messages in thread
From: Thomas Gummerer @ 2019-03-09 17:27 UTC (permalink / raw)
  To: Duy Nguyen
  Cc: Philip Oakley, Junio C Hamano, Git Mailing List, Jonathan Nieder

On 03/07, Duy Nguyen wrote:
> On Thu, Mar 7, 2019 at 7:34 PM Philip Oakley <philipoakley@iee.org> wrote:
> >
> > On 06/03/2019 09:44, Duy Nguyen wrote:
> > > On Wed, Mar 6, 2019 at 8:34 AM Junio C Hamano <gitster@pobox.com> wrote:
> > >> * tg/checkout-no-overlay (2019-02-04) 9 commits
> > >>    (merged to 'next' on 2019-02-04 at 9968bcf4fb)
> > >>   + revert "checkout: introduce checkout.overlayMode config"
> > >>    (merged to 'next' on 2019-01-18 at 1e2a79ba5c)
> > >>   + checkout: introduce checkout.overlayMode config
> > >>   + checkout: introduce --{,no-}overlay option
> > >>   + checkout: factor out mark_cache_entry_for_checkout function
> > >>   + checkout: clarify comment
> > >>   + read-cache: add invalidate parameter to remove_marked_cache_entries
> > >>   + entry: support CE_WT_REMOVE flag in checkout_entry
> > >>   + entry: factor out unlink_entry function
> > >>   + move worktree tests to t24*
> > >>
> > >>   "git checkout --no-overlay" can be used to trigger a new mode of
> > >>   checking out paths out of the tree-ish, that allows paths that
> > >>   match the pathspec that are in the current index and working tree
> > >>   and are not in the tree-ish.
> > >>
> > >>   Will hold.
> > >>   Waiting for "restore-files" & "switch-branches" pair.
> > >>   cf. <20190205204208.GC6085@hank.intra.tgummerer.com>
> > > If it's ready for master, I'd love to see it merged. Either that or
> > > topic is rebased on 'master'. There are separate checkout changes in
> > > 'master' (mine, sadly), and because switch/restore moves lots of code
> > > around, I need to create a merge of this topic and master as the base,
> > > or you'll get horrible conflicts.
> > >
> > > I should send switch/restore again soon. There are still a few
> > > unaddressed concerns for git-restore since last time. Probably time to
> > > refresh those discussions.
> >
> > Just catching up on back emails:
> >
> > The one point I noted is that "Overlay" is a new magic term without any
> > explanation within the _documentation_.
> >
> > It would appear worth it to also add something (follow up patch?) to the
> > e.g. git glossary to clarify how overlay differs, or is similar to, the
> > different merge and reset modes.
> 
> I think Jonathan questions the name "overlay" too. Since this is
> similar to "cp -R" mode, another suggestion is --copy-mode.

That would leave the negative form as --no-copy-mode, which almost
sounds like we wouldn't copy anything.  I think that would be more
confusing that [no ]overlay mode.

I'd be fine in general with changing the name, if there is a consensus
for a different and better name, but I also think overlay is
reasonable, so I'd rather leave pushing for a different name to
someone else that has strong opinions about it.

Philip, do you think something like this would help?  Not sure if it
should be called overlay_mode in the glossary, rather than just
overlay?

--- >8 ---
Subject: [PATCH] glossary: add definition for overlay

Add a definition for what overlay means in the context of git, to
clarify the recently introduced overlay-mode in git checkout.

Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
---
 Documentation/glossary-content.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 023ca95e7c..70e6477a9f 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -287,6 +287,11 @@ This commit is referred to as a "merge commit", or sometimes just a
 	origin/name-of-upstream-branch, which you can see using
 	`git branch -r`.
 
+[[def_overlay]]overlay::
+	Only update and add files to the working directory, but don't
+	delete them, similar to how 'cp -R' works.  This is the
+	default in a <<def_checkout,checkout>>.
+
 [[def_pack]]pack::
 	A set of objects which have been compressed into one file (to save space
 	or to transmit them efficiently).
-- 
2.20.1.495.gaa96b0ce6b


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

* Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)
  2019-03-09 17:27       ` Thomas Gummerer
@ 2019-03-09 18:04         ` Elijah Newren
  2019-03-10 18:27           ` Thomas Gummerer
  2019-03-12 23:30         ` [PATCH v2] glossary: add definition for overlay Thomas Gummerer
  1 sibling, 1 reply; 31+ messages in thread
From: Elijah Newren @ 2019-03-09 18:04 UTC (permalink / raw)
  To: Thomas Gummerer
  Cc: Duy Nguyen, Philip Oakley, Junio C Hamano, Git Mailing List,
	Jonathan Nieder

Hi,

On Sat, Mar 9, 2019 at 9:29 AM Thomas Gummerer <t.gummerer@gmail.com> wrote:
>
> On 03/07, Duy Nguyen wrote:
> > On Thu, Mar 7, 2019 at 7:34 PM Philip Oakley <philipoakley@iee.org> wrote:
> > >
> > > On 06/03/2019 09:44, Duy Nguyen wrote:
> > > > On Wed, Mar 6, 2019 at 8:34 AM Junio C Hamano <gitster@pobox.com> wrote:
> > > >> * tg/checkout-no-overlay (2019-02-04) 9 commits
> > > >>    (merged to 'next' on 2019-02-04 at 9968bcf4fb)
> > > >>   + revert "checkout: introduce checkout.overlayMode config"
> > > >>    (merged to 'next' on 2019-01-18 at 1e2a79ba5c)
> > > >>   + checkout: introduce checkout.overlayMode config
> > > >>   + checkout: introduce --{,no-}overlay option
> > > >>   + checkout: factor out mark_cache_entry_for_checkout function
> > > >>   + checkout: clarify comment
> > > >>   + read-cache: add invalidate parameter to remove_marked_cache_entries
> > > >>   + entry: support CE_WT_REMOVE flag in checkout_entry
> > > >>   + entry: factor out unlink_entry function
> > > >>   + move worktree tests to t24*
> > > >>
> > > >>   "git checkout --no-overlay" can be used to trigger a new mode of
> > > >>   checking out paths out of the tree-ish, that allows paths that
> > > >>   match the pathspec that are in the current index and working tree
> > > >>   and are not in the tree-ish.
> > > >>
> > > >>   Will hold.
> > > >>   Waiting for "restore-files" & "switch-branches" pair.
> > > >>   cf. <20190205204208.GC6085@hank.intra.tgummerer.com>
> > > > If it's ready for master, I'd love to see it merged. Either that or
> > > > topic is rebased on 'master'. There are separate checkout changes in
> > > > 'master' (mine, sadly), and because switch/restore moves lots of code
> > > > around, I need to create a merge of this topic and master as the base,
> > > > or you'll get horrible conflicts.
> > > >
> > > > I should send switch/restore again soon. There are still a few
> > > > unaddressed concerns for git-restore since last time. Probably time to
> > > > refresh those discussions.
> > >
> > > Just catching up on back emails:
> > >
> > > The one point I noted is that "Overlay" is a new magic term without any
> > > explanation within the _documentation_.
> > >
> > > It would appear worth it to also add something (follow up patch?) to the
> > > e.g. git glossary to clarify how overlay differs, or is similar to, the
> > > different merge and reset modes.
> >
> > I think Jonathan questions the name "overlay" too. Since this is
> > similar to "cp -R" mode, another suggestion is --copy-mode.
>
> That would leave the negative form as --no-copy-mode, which almost
> sounds like we wouldn't copy anything.  I think that would be more
> confusing that [no ]overlay mode.
>
> I'd be fine in general with changing the name, if there is a consensus
> for a different and better name, but I also think overlay is
> reasonable, so I'd rather leave pushing for a different name to
> someone else that has strong opinions about it.
>
> Philip, do you think something like this would help?  Not sure if it
> should be called overlay_mode in the glossary, rather than just
> overlay?
>
> --- >8 ---
> Subject: [PATCH] glossary: add definition for overlay
>
> Add a definition for what overlay means in the context of git, to
> clarify the recently introduced overlay-mode in git checkout.
>
> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
> ---
>  Documentation/glossary-content.txt | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
> index 023ca95e7c..70e6477a9f 100644
> --- a/Documentation/glossary-content.txt
> +++ b/Documentation/glossary-content.txt
> @@ -287,6 +287,11 @@ This commit is referred to as a "merge commit", or sometimes just a
>         origin/name-of-upstream-branch, which you can see using
>         `git branch -r`.
>
> +[[def_overlay]]overlay::
> +       Only update and add files to the working directory, but don't
> +       delete them, similar to how 'cp -R' works.  This is the
> +       default in a <<def_checkout,checkout>>.

I think this is good, but maybe also add:
   In contrast, no-overlay mode will also delete files not present in
the source, similar to 'rsync --delete'
?

> +
>  [[def_pack]]pack::
>         A set of objects which have been compressed into one file (to save space
>         or to transmit them efficiently).
> --
> 2.20.1.495.gaa96b0ce6b

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

* Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)
  2019-03-09 18:04         ` Elijah Newren
@ 2019-03-10 18:27           ` Thomas Gummerer
  0 siblings, 0 replies; 31+ messages in thread
From: Thomas Gummerer @ 2019-03-10 18:27 UTC (permalink / raw)
  To: Elijah Newren
  Cc: Duy Nguyen, Philip Oakley, Junio C Hamano, Git Mailing List,
	Jonathan Nieder

On 03/09, Elijah Newren wrote:
> Hi,
> 
> On Sat, Mar 9, 2019 at 9:29 AM Thomas Gummerer <t.gummerer@gmail.com> wrote:
> >
> > On 03/07, Duy Nguyen wrote:
> > > On Thu, Mar 7, 2019 at 7:34 PM Philip Oakley <philipoakley@iee.org> wrote:
> > > > The one point I noted is that "Overlay" is a new magic term without any
> > > > explanation within the _documentation_.
> > > >
> > > > It would appear worth it to also add something (follow up patch?) to the
> > > > e.g. git glossary to clarify how overlay differs, or is similar to, the
> > > > different merge and reset modes.
> > >
> > > I think Jonathan questions the name "overlay" too. Since this is
> > > similar to "cp -R" mode, another suggestion is --copy-mode.
> >
> > That would leave the negative form as --no-copy-mode, which almost
> > sounds like we wouldn't copy anything.  I think that would be more
> > confusing that [no ]overlay mode.
> >
> > I'd be fine in general with changing the name, if there is a consensus
> > for a different and better name, but I also think overlay is
> > reasonable, so I'd rather leave pushing for a different name to
> > someone else that has strong opinions about it.
> >
> > Philip, do you think something like this would help?  Not sure if it
> > should be called overlay_mode in the glossary, rather than just
> > overlay?
> >
> > --- >8 ---
> > Subject: [PATCH] glossary: add definition for overlay
> >
> > Add a definition for what overlay means in the context of git, to
> > clarify the recently introduced overlay-mode in git checkout.
> >
> > Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
> > ---
> >  Documentation/glossary-content.txt | 5 +++++
> >  1 file changed, 5 insertions(+)
> >
> > diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
> > index 023ca95e7c..70e6477a9f 100644
> > --- a/Documentation/glossary-content.txt
> > +++ b/Documentation/glossary-content.txt
> > @@ -287,6 +287,11 @@ This commit is referred to as a "merge commit", or sometimes just a
> >         origin/name-of-upstream-branch, which you can see using
> >         `git branch -r`.
> >
> > +[[def_overlay]]overlay::
> > +       Only update and add files to the working directory, but don't
> > +       delete them, similar to how 'cp -R' works.  This is the
> > +       default in a <<def_checkout,checkout>>.
> 
> I think this is good, but maybe also add:
>    In contrast, no-overlay mode will also delete files not present in
> the source, similar to 'rsync --delete'
> ?

Yeah, I think that makes sense, thanks!  I'll wait a bit more to see
if there are any other comments, and then send an updated version.

> > +
> >  [[def_pack]]pack::
> >         A set of objects which have been compressed into one file (to save space
> >         or to transmit them efficiently).
> > --
> > 2.20.1.495.gaa96b0ce6b

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

* [PATCH v2] glossary: add definition for overlay
  2019-03-09 17:27       ` Thomas Gummerer
  2019-03-09 18:04         ` Elijah Newren
@ 2019-03-12 23:30         ` Thomas Gummerer
  2019-03-13  1:13           ` Duy Nguyen
                             ` (2 more replies)
  1 sibling, 3 replies; 31+ messages in thread
From: Thomas Gummerer @ 2019-03-12 23:30 UTC (permalink / raw)
  To: Duy Nguyen
  Cc: Philip Oakley, Junio C Hamano, Git Mailing List, Jonathan Nieder,
	Elijah Newren

Add a definition for what overlay means in the context of git, to
clarify the recently introduced overlay-mode in git checkout.

Helped-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
---

v2 addresses Elijah's comments (thanks!), using the wording he
suggested in [*1*], which I agree is slightly better, as no-overlay
mode doesn't touch untracked files.

*1*: https://public-inbox.org/git/CABPp-BEv1taYym_084qVJj3-jkWWS9hKXZ=grrmH7PDUb5ASwA@mail.gmail.com/

 Documentation/glossary-content.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 023ca95e7c..53df6ecb0a 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -287,6 +287,13 @@ This commit is referred to as a "merge commit", or sometimes just a
 	origin/name-of-upstream-branch, which you can see using
 	`git branch -r`.
 
+[[def_overlay]]overlay::
+	Only update and add files to the working directory, but don't
+	delete them, similar to how 'cp -R' would work.  This is the
+	default mode in a <<def_checkout,checkout>>.  In contrast,
+	no-overlay mode will also delete tracked files not present in
+	the source, similar to 'rsync --delete'.
+
 [[def_pack]]pack::
 	A set of objects which have been compressed into one file (to save space
 	or to transmit them efficiently).
-- 
2.21.0.474.g541d9dca55


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

* Re: [PATCH v2] glossary: add definition for overlay
  2019-03-12 23:30         ` [PATCH v2] glossary: add definition for overlay Thomas Gummerer
@ 2019-03-13  1:13           ` Duy Nguyen
  2019-03-15 22:31             ` Thomas Gummerer
  2019-03-13  1:42           ` Junio C Hamano
  2019-03-17 20:19           ` [PATCH v3] " Thomas Gummerer
  2 siblings, 1 reply; 31+ messages in thread
From: Duy Nguyen @ 2019-03-13  1:13 UTC (permalink / raw)
  To: Thomas Gummerer
  Cc: Philip Oakley, Junio C Hamano, Git Mailing List, Jonathan Nieder,
	Elijah Newren

On Wed, Mar 13, 2019 at 6:30 AM Thomas Gummerer <t.gummerer@gmail.com> wrote:
>
> Add a definition for what overlay means in the context of git, to
> clarify the recently introduced overlay-mode in git checkout.
>
> Helped-by: Elijah Newren <newren@gmail.com>
> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
> ---
>
> v2 addresses Elijah's comments (thanks!), using the wording he
> suggested in [*1*], which I agree is slightly better, as no-overlay
> mode doesn't touch untracked files.

It could overwrite untracked files (e.g. the file is present in the
source, but not tracked) but never delete them. But I think it's the
little detail that we could skip.
-- 
Duy

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

* Re: [PATCH v2] glossary: add definition for overlay
  2019-03-12 23:30         ` [PATCH v2] glossary: add definition for overlay Thomas Gummerer
  2019-03-13  1:13           ` Duy Nguyen
@ 2019-03-13  1:42           ` Junio C Hamano
  2019-03-15 23:10             ` Thomas Gummerer
  2019-03-17 20:19           ` [PATCH v3] " Thomas Gummerer
  2 siblings, 1 reply; 31+ messages in thread
From: Junio C Hamano @ 2019-03-13  1:42 UTC (permalink / raw)
  To: Thomas Gummerer
  Cc: Duy Nguyen, Philip Oakley, Git Mailing List, Jonathan Nieder,
	Elijah Newren

Thomas Gummerer <t.gummerer@gmail.com> writes:

> diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
> index 023ca95e7c..53df6ecb0a 100644
> --- a/Documentation/glossary-content.txt
> +++ b/Documentation/glossary-content.txt
> @@ -287,6 +287,13 @@ This commit is referred to as a "merge commit", or sometimes just a
>  	origin/name-of-upstream-branch, which you can see using
>  	`git branch -r`.
>  
> +[[def_overlay]]overlay::
> +	Only update and add files to the working directory, but don't
> +	delete them, similar to how 'cp -R' would work.  This is the
> +	default mode in a <<def_checkout,checkout>>.  In contrast,
> +	no-overlay mode will also delete tracked files not present in
> +	the source, similar to 'rsync --delete'.
> +

At least the mention of "checkout" needs to be a lot tightened to
clarify that it is talking about "checkout <pathspec>", aka
"checking out files out of the index or a tree-ish", as opposed to
"checking out a branch to work on it", as checking out a branch will
not work in the overlay fashion.  What's not in the newly checked
out branch will disappear from the working tree.

If readers happen to be not paying close attention to the fact that
the difference between overlay and non-overlay is about the
destination, "similar to how 'cp -R' would work" may not click to
their minds.  "similar to how 'cp -R' updates the contents in the
destination directory" may avoid such a risk, albeit it might be a
bit too verbose.  I dunno.

Thanks.

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

* Re: [PATCH v2] glossary: add definition for overlay
  2019-03-13  1:13           ` Duy Nguyen
@ 2019-03-15 22:31             ` Thomas Gummerer
  0 siblings, 0 replies; 31+ messages in thread
From: Thomas Gummerer @ 2019-03-15 22:31 UTC (permalink / raw)
  To: Duy Nguyen
  Cc: Philip Oakley, Junio C Hamano, Git Mailing List, Jonathan Nieder,
	Elijah Newren

On 03/13, Duy Nguyen wrote:
> On Wed, Mar 13, 2019 at 6:30 AM Thomas Gummerer <t.gummerer@gmail.com> wrote:
> >
> > Add a definition for what overlay means in the context of git, to
> > clarify the recently introduced overlay-mode in git checkout.
> >
> > Helped-by: Elijah Newren <newren@gmail.com>
> > Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
> > ---
> >
> > v2 addresses Elijah's comments (thanks!), using the wording he
> > suggested in [*1*], which I agree is slightly better, as no-overlay
> > mode doesn't touch untracked files.
> 
> It could overwrite untracked files (e.g. the file is present in the
> source, but not tracked) but never delete them. But I think it's the
> little detail that we could skip.

Right, we decided to go without that detail in the documentation for
the command line option as well [*1*].  I think the argument that an
overly precise description would make the description harder to
understand is also valid here.  Though if someone can come up with a
nice phrasing for that I'd be happy to add that.

*1*: https://public-inbox.org/git/xmqqo98yiq8i.fsf@gitster-ct.c.googlers.com/

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

* Re: [PATCH v2] glossary: add definition for overlay
  2019-03-13  1:42           ` Junio C Hamano
@ 2019-03-15 23:10             ` Thomas Gummerer
  0 siblings, 0 replies; 31+ messages in thread
From: Thomas Gummerer @ 2019-03-15 23:10 UTC (permalink / raw)
  To: Junio C Hamano
  Cc: Duy Nguyen, Philip Oakley, Git Mailing List, Jonathan Nieder,
	Elijah Newren

On 03/13, Junio C Hamano wrote:
> Thomas Gummerer <t.gummerer@gmail.com> writes:
> 
> > diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
> > index 023ca95e7c..53df6ecb0a 100644
> > --- a/Documentation/glossary-content.txt
> > +++ b/Documentation/glossary-content.txt
> > @@ -287,6 +287,13 @@ This commit is referred to as a "merge commit", or sometimes just a
> >  	origin/name-of-upstream-branch, which you can see using
> >  	`git branch -r`.
> >  
> > +[[def_overlay]]overlay::
> > +	Only update and add files to the working directory, but don't
> > +	delete them, similar to how 'cp -R' would work.  This is the
> > +	default mode in a <<def_checkout,checkout>>.  In contrast,
> > +	no-overlay mode will also delete tracked files not present in
> > +	the source, similar to 'rsync --delete'.
> > +
> 
> At least the mention of "checkout" needs to be a lot tightened to
> clarify that it is talking about "checkout <pathspec>", aka
> "checking out files out of the index or a tree-ish", as opposed to
> "checking out a branch to work on it", as checking out a branch will
> not work in the overlay fashion.  What's not in the newly checked
> out branch will disappear from the working tree.

Good point, I'll fix that in v3.

> If readers happen to be not paying close attention to the fact that
> the difference between overlay and non-overlay is about the
> destination, "similar to how 'cp -R' would work" may not click to
> their minds.  "similar to how 'cp -R' updates the contents in the
> destination directory" may avoid such a risk, albeit it might be a
> bit too verbose.  I dunno.

I feel like it's okay to be a bit more verbose in the glossary.  I
think your suggestion above is better than what I had, I'll use that
in v3, thanks!

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

* [PATCH v3] glossary: add definition for overlay
  2019-03-12 23:30         ` [PATCH v2] glossary: add definition for overlay Thomas Gummerer
  2019-03-13  1:13           ` Duy Nguyen
  2019-03-13  1:42           ` Junio C Hamano
@ 2019-03-17 20:19           ` Thomas Gummerer
  2019-03-21 14:48             ` Philip Oakley
  2 siblings, 1 reply; 31+ messages in thread
From: Thomas Gummerer @ 2019-03-17 20:19 UTC (permalink / raw)
  To: Duy Nguyen
  Cc: Philip Oakley, Junio C Hamano, Git Mailing List, Jonathan Nieder,
	Elijah Newren

Add a definition for what overlay means in the context of git, to
clarify the recently introduced overlay-mode in git checkout.

Helped-by: Elijah Newren <newren@gmail.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
---

v3 incorporates Junios suggestions from [*1*], and clarifies that this
only applies to checking out from the index or a tree-ish, and
clarifies that the files are updated like in the destination directory
of 'cp -R'.  I thought of making the same clarification for 'rsync
--delete' as well, however I think with it being explicitly specified
for 'cp -R', readers should be able to deduce that we are talking
about the destination directory there as well.

*1*: <xmqq5zsnh7my.fsf@gitster-ct.c.googlers.com>

 Documentation/glossary-content.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 023ca95e7c..0f29075551 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -287,6 +287,15 @@ This commit is referred to as a "merge commit", or sometimes just a
 	origin/name-of-upstream-branch, which you can see using
 	`git branch -r`.
 
+[[def_overlay]]overlay::
+	Only update and add files to the working directory, but don't
+	delete them, similar to how 'cp -R' would update the contents
+	in the destination directory.  This is the default mode in a
+	<<def_checkout,checkout>> when checking out files from the
+	<<def_index,index>> or a <<def_tree-ish,tree-ish>>.  In
+	contrast, no-overlay mode also deletes tracked files not
+	present in the source, similar to 'rsync --delete'.
+
 [[def_pack]]pack::
 	A set of objects which have been compressed into one file (to save space
 	or to transmit them efficiently).
-- 
2.21.0.225.g810b269d1a

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

* Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)
  2019-03-06 12:39 ` Johannes Schindelin
@ 2019-03-18  7:08   ` Junio C Hamano
  0 siblings, 0 replies; 31+ messages in thread
From: Junio C Hamano @ 2019-03-18  7:08 UTC (permalink / raw)
  To: Johannes Schindelin; +Cc: git

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

>>  "gir rebase" that was reimplemented in C did not set ORIG_HEAD
>
> s/gir/git/ (assuming that you use these descriptions to generate the
> announcement mails?)

Thanks.

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

* Re: [PATCH v3] glossary: add definition for overlay
  2019-03-17 20:19           ` [PATCH v3] " Thomas Gummerer
@ 2019-03-21 14:48             ` Philip Oakley
  2019-03-22  4:54               ` Junio C Hamano
  0 siblings, 1 reply; 31+ messages in thread
From: Philip Oakley @ 2019-03-21 14:48 UTC (permalink / raw)
  To: Thomas Gummerer, Duy Nguyen
  Cc: Junio C Hamano, Git Mailing List, Jonathan Nieder, Elijah Newren

Hi, sorry for the late response..

On 17/03/2019 20:19, Thomas Gummerer wrote:
> Add a definition for what overlay means in the context of git, to
> clarify the recently introduced overlay-mode in git checkout.
>
> Helped-by: Elijah Newren <newren@gmail.com>
> Helped-by: Junio C Hamano <gitster@pobox.com>
> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
> ---
>
> v3 incorporates Junios suggestions from [*1*], and clarifies that this
> only applies to checking out from the index or a tree-ish, and
> clarifies that the files are updated like in the destination directory
> of 'cp -R'.  I thought of making the same clarification for 'rsync
> --delete' as well, however I think with it being explicitly specified
> for 'cp -R', readers should be able to deduce that we are talking
> about the destination directory there as well.
As a historically Windows user, we should ensure that the meaning is 
clear to all without the otherwise helpful *nix command examples.
>
> *1*: <xmqq5zsnh7my.fsf@gitster-ct.c.googlers.com>
>
>   Documentation/glossary-content.txt | 9 +++++++++
>   1 file changed, 9 insertions(+)
>
> diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
> index 023ca95e7c..0f29075551 100644
> --- a/Documentation/glossary-content.txt
> +++ b/Documentation/glossary-content.txt
> @@ -287,6 +287,15 @@ This commit is referred to as a "merge commit", or sometimes just a
>   	origin/name-of-upstream-branch, which you can see using
>   	`git branch -r`.
>   
> +[[def_overlay]]overlay::
> +	Only update and add files to the working directory, but don't
> +	delete them, similar to how 'cp -R' would update the contents
perhaps  s/them/any files/
> +	in the destination directory.  This is the default mode in a
> +	<<def_checkout,checkout>> when checking out files from the
> +	<<def_index,index>> or a <<def_tree-ish,tree-ish>>.  In
> +	contrast, no-overlay mode also deletes tracked files not

understanding the past/future distinction is tricky here. Maybe 'deletes 
previously tracked files that are no longer present in the new source'.

It's tricky talking about deleting things that are not there.

> +	present in the source, similar to 'rsync --delete'.
> +
>   [[def_pack]]pack::
>   	A set of objects which have been compressed into one file (to save space
>   	or to transmit them efficiently).

--

Philip


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

* Re: [PATCH v3] glossary: add definition for overlay
  2019-03-21 14:48             ` Philip Oakley
@ 2019-03-22  4:54               ` Junio C Hamano
  2019-03-28 21:05                 ` Thomas Gummerer
  0 siblings, 1 reply; 31+ messages in thread
From: Junio C Hamano @ 2019-03-22  4:54 UTC (permalink / raw)
  To: Philip Oakley
  Cc: Thomas Gummerer, Duy Nguyen, Git Mailing List, Jonathan Nieder,
	Elijah Newren

Philip Oakley <philipoakley@iee.org> writes:

>> of 'cp -R'.  I thought of making the same clarification for 'rsync
>> --delete' as well, however I think with it being explicitly specified
>> for 'cp -R', readers should be able to deduce that we are talking
>> about the destination directory there as well.
> As a historically Windows user, we should ensure that the meaning is
> clear to all without the otherwise helpful *nix command examples.

I do not know about "cp -R", but surely "rsync" is used by Windows
users as well as users of Unix based systems, isn't it?

>> +	Only update and add files to the working directory, but don't
>> +	delete them, similar to how 'cp -R' would update the contents

> perhaps  s/them/any files/

Probably.  The paths that are not deleted are certainly different
set of paths from those that are updated and/or added, so it sounds
like a reasonable thing to do.

>> +	in the destination directory.  This is the default mode in a
>> +	<<def_checkout,checkout>> when checking out files from the
>> +	<<def_index,index>> or a <<def_tree-ish,tree-ish>>.  In
>> +	contrast, no-overlay mode also deletes tracked files not
>
> understanding the past/future distinction is tricky here. Maybe
> 'deletes previously tracked files that are no longer present in the
> new source'.
>
> It's tricky talking about deleting things that are not there.

I am afraid that "previously" may be taken too literally by readers
and misunderstood as paths that had been tracked even once in the
past.  

If you think that is worried too much because we can only delete
what is _currently_ in the index, and any past before what is in the
current index cannot ever affect the outcome, the same reasoning
tells me that the original is clear enough without "previously",
i.e. "tracked ones not present in..." are the ones that are in the
index currently, but the tree that we are taking new contents from
does not have them.

I dunno.

>> +	present in the source, similar to 'rsync --delete'.

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

* Re: [PATCH v3] glossary: add definition for overlay
  2019-03-22  4:54               ` Junio C Hamano
@ 2019-03-28 21:05                 ` Thomas Gummerer
  0 siblings, 0 replies; 31+ messages in thread
From: Thomas Gummerer @ 2019-03-28 21:05 UTC (permalink / raw)
  To: Junio C Hamano
  Cc: Philip Oakley, Duy Nguyen, Git Mailing List, Jonathan Nieder,
	Elijah Newren

On 03/22, Junio C Hamano wrote:
> Philip Oakley <philipoakley@iee.org> writes:
> 
> >> of 'cp -R'.  I thought of making the same clarification for 'rsync
> >> --delete' as well, however I think with it being explicitly specified
> >> for 'cp -R', readers should be able to deduce that we are talking
> >> about the destination directory there as well.
> > As a historically Windows user, we should ensure that the meaning is
> > clear to all without the otherwise helpful *nix command examples.

Sure, it would definitely be good to be clear to users of all
platforms.  Is the text by itself not understandable enough?  If not
do you have any suggestions to improve it?

I think giving the example of 'cp -R' is still good, even if not all
Windows users are familiar with it, as it's supposed to provide some
additional context.  But it's only an additional example, the sentence
is supposed to be understandable either way.  Would there be a similar
command for Windows that could be used as an example?

> I do not know about "cp -R", but surely "rsync" is used by Windows
> users as well as users of Unix based systems, isn't it?
> 
> >> +	Only update and add files to the working directory, but don't
> >> +	delete them, similar to how 'cp -R' would update the contents
> 
> > perhaps  s/them/any files/
> 
> Probably.  The paths that are not deleted are certainly different
> set of paths from those that are updated and/or added, so it sounds
> like a reasonable thing to do.

Thanks, will update this.

> >> +	in the destination directory.  This is the default mode in a
> >> +	<<def_checkout,checkout>> when checking out files from the
> >> +	<<def_index,index>> or a <<def_tree-ish,tree-ish>>.  In
> >> +	contrast, no-overlay mode also deletes tracked files not
> >
> > understanding the past/future distinction is tricky here. Maybe
> > 'deletes previously tracked files that are no longer present in the
> > new source'.
> >
> > It's tricky talking about deleting things that are not there.
> 
> I am afraid that "previously" may be taken too literally by readers
> and misunderstood as paths that had been tracked even once in the
> past.  
> 
> If you think that is worried too much because we can only delete
> what is _currently_ in the index, and any past before what is in the
> current index cannot ever affect the outcome, the same reasoning
> tells me that the original is clear enough without "previously",
> i.e. "tracked ones not present in..." are the ones that are in the
> index currently, but the tree that we are taking new contents from
> does not have them.

Agreed, I think I prefer the current version over the suggested change
here too.

> I dunno.
> 
> >> +	present in the source, similar to 'rsync --delete'.

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

end of thread, other threads:[~2019-03-28 21:05 UTC | newest]

Thread overview: 31+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-06  1:34 What's cooking in git.git (Mar 2019, #01; Wed, 6) Junio C Hamano
2019-03-06  1:41 ` Denton Liu
2019-03-06 23:43   ` Junio C Hamano
2019-03-06  4:43 ` Jeff King
2019-03-06 23:45   ` Junio C Hamano
2019-03-06  9:44 ` Duy Nguyen
2019-03-06 23:46   ` Junio C Hamano
2019-03-07 12:34   ` Philip Oakley
2019-03-07 12:54     ` Duy Nguyen
2019-03-09 17:27       ` Thomas Gummerer
2019-03-09 18:04         ` Elijah Newren
2019-03-10 18:27           ` Thomas Gummerer
2019-03-12 23:30         ` [PATCH v2] glossary: add definition for overlay Thomas Gummerer
2019-03-13  1:13           ` Duy Nguyen
2019-03-15 22:31             ` Thomas Gummerer
2019-03-13  1:42           ` Junio C Hamano
2019-03-15 23:10             ` Thomas Gummerer
2019-03-17 20:19           ` [PATCH v3] " Thomas Gummerer
2019-03-21 14:48             ` Philip Oakley
2019-03-22  4:54               ` Junio C Hamano
2019-03-28 21:05                 ` Thomas Gummerer
2019-03-08  0:02     ` What's cooking in git.git (Mar 2019, #01; Wed, 6) Junio C Hamano
2019-03-06 12:39 ` Johannes Schindelin
2019-03-18  7:08   ` Junio C Hamano
2019-03-06 12:47 ` Johannes Schindelin
2019-03-06 23:55   ` Junio C Hamano
2019-03-06 13:26 ` Johannes Schindelin
2019-03-06 13:41 ` ps/stash-in-c, was " Johannes Schindelin
2019-03-06 23:56   ` Junio C Hamano
2019-03-06 18:10 ` Jonathan Tan
2019-03-07  0:19   ` Junio C Hamano

git@vger.kernel.org list mirror (unofficial, one of many)

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 git git/ https://public-inbox.org/git \
		git@vger.kernel.org
	public-inbox-index git

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.io/gmane.comp.version-control.git
 note: .onion URLs require Tor: https://www.torproject.org/

code repositories for the project(s) associated with this inbox:

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

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git