git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* What's cooking in git.git (Apr 2019, #03; Tue, 16)
@ 2019-04-16 13:19 Junio C Hamano
  2019-04-16 14:51 ` Ævar Arnfjörð Bjarmason
                   ` (7 more replies)
  0 siblings, 8 replies; 24+ messages in thread
From: Junio C Hamano @ 2019-04-16 13:19 UTC (permalink / raw)
  To: git

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.

Yet another batch of ~30 topics have graduated to 'master', and
'next' has also gained ~25 topics.  We may want to start merging
down fixes to 'maint' for a 2.21.1.

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

--------------------------------------------------
[Graduated to "master"]

* ab/doc-misc-typofixes (2019-03-18) 1 commit
  (merged to 'next' on 2019-04-10 at 06d19acd7e)
 + doc: fix typos in man pages

 Typofixes.


* ab/drop-scripted-rebase (2019-03-20) 1 commit
  (merged to 'next' on 2019-04-10 at ff8abf36ae)
 + rebase: remove the rebase.useBuiltin setting

 Retire scripted "git rebase" implementation.


* bb/unicode-12 (2019-03-22) 1 commit
  (merged to 'next' on 2019-04-10 at b0dfa1001e)
 + unicode: update the width tables to Unicode 12

 Unicode update.


* dl/subtree-limit-to-one-rev (2019-03-12) 1 commit
  (merged to 'next' on 2019-04-10 at 8631f869c5)
 + contrib/subtree: ensure only one rev is provided

 "git subtree" (in contrib/) update.


* jc/format-patch-error-check (2019-02-22) 2 commits
  (merged to 'next' on 2019-04-10 at 6ca358b7ef)
 + format-patch: notice failure to open cover letter for writing
 + builtin/log: downcase the beginning of error messages
 (this branch is used by jc/format-patch-noclobber.)

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


* jh/midx-verify-too-many-packs (2019-03-22) 4 commits
  (merged to 'next' on 2019-04-10 at 2ac6c933d4)
 + midx: during verify group objects by packfile to speed verification
 + midx: add progress indicators in multi-pack-index verify
 + trace2:data: add trace2 data to midx
 + progress: add sparse mode to force 100% complete message

 "git multi-pack-index verify" did not scale well with the number of
 packfiles, which is being improved.


* jk/http-walker-status-fix (2019-03-24) 3 commits
  (merged to 'next' on 2019-04-10 at d49336dd3b)
 + http: use normalize_curl_result() instead of manual conversion
 + http: normalize curl results for dumb loose and alternates fetches
 + http: factor out curl result code normalization

 dumb-http walker has been updated to share more error recovery
 strategy with the normal codepath.


* jk/perf-lib-tee (2019-03-18) 1 commit
  (merged to 'next' on 2019-04-10 at de18327138)
 + perf-lib.sh: rely on test-lib.sh for --tee handling

 Code cleanup in the test framework.


* jk/refs-double-abort (2019-03-22) 2 commits
  (merged to 'next' on 2019-04-10 at e160d4a5b0)
 + refs/files-backend: don't look at an aborted transaction
 + refs/files-backend: handle packed transaction prepare failure

 A corner case bug in the refs API has been corrected.


* js/anonymize-remote-curl-diag (2019-03-05) 1 commit
  (merged to 'next' on 2019-04-10 at 137a191021)
 + curl: anonymize URLs in error messages and warnings
 (this branch is used by js/remote-curl-i18n.)

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


* js/get-short-oid-drop-cache (2019-03-14) 4 commits
  (merged to 'next' on 2019-04-10 at 5c77e39722)
 + get_oid(): when an object was not found, try harder
 + sequencer: move stale comment into correct location
 + sequencer: improve error message when an OID could not be parsed
 + rebase -i: demonstrate obscure loose object cache bug

 A corner-case object name ambiguity while the sequencer machinery
 is working (e.g. "rebase -i -x") has been fixed.


* js/init-db-update-for-mingw (2019-03-12) 1 commit
  (merged to 'next' on 2019-04-10 at 1d5768849f)
 + mingw: respect core.hidedotfiles = false in git-init again

 "git init" forgot to read platform-specific repository
 configuration, which made Windows port to ignore settings of
 core.hidedotfiles, for example.


* js/remote-curl-i18n (2019-03-06) 1 commit
  (merged to 'next' on 2019-04-10 at 4814acf6c8)
 + remote-curl: mark all error messages for translation
 (this branch uses js/anonymize-remote-curl-diag.)

 Error messages given from the http transport have been updated so
 that they can be localized.


* jt/t5551-protocol-v2-does-not-have-half-auth (2019-03-24) 1 commit
  (merged to 'next' on 2019-04-10 at 86ca3ebf33)
 + t5551: mark half-auth no-op fetch test as v0-only

 Test update.


* jt/test-protocol-version (2019-03-07) 8 commits
  (merged to 'next' on 2019-03-20 at 0c97907bdb)
 + 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
 + t5601: check ssh command only with protocol v0
 + tests: define GIT_TEST_PROTOCOL_VERSION
 (this branch is used by jt/fetch-no-update-shallow-in-proto-v2.)

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


* ma/asciidoctor-fixes (2019-03-11) 3 commits
  (merged to 'next' on 2019-04-10 at 41a7f51003)
 + 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


* ma/asciidoctor-fixes-more (2019-03-07) 5 commits
  (merged to 'next' on 2019-04-10 at 77cf886e7e)
 + Documentation: turn middle-of-line tabs into spaces
 + git-svn.txt: drop escaping '\' that ends up being rendered
 + git.txt: remove empty line before list continuation
 + config/fsck.txt: avoid starting line with dash
 + config/diff.txt: drop spurious backtick

 Documentation mark-up fixes.


* ma/doc-diff-doc-vs-doctor-comparison (2019-03-18) 4 commits
  (merged to 'next' on 2019-04-10 at af08a97ab9)
 + doc-diff: add `--cut-header-footer`
 + doc-diff: support diffing from/to AsciiDoc(tor)
 + doc-diff: let `render_tree()` take an explicit directory name
 + Doc: auto-detect changed build flags

 Dev support update to make it easier to compare two formatted
 results from our documentation.
 cf. <20190319031412.GC6173@sigill.intra.peff.net>


* mh/pack-protocol-doc-fix (2019-03-18) 1 commit
  (merged to 'next' on 2019-04-10 at 037673d71c)
 + fix pack protocol example client/server communication

 Docfix.


* nd/checkout-f-while-conflicted-fix (2019-03-21) 1 commit
  (merged to 'next' on 2019-04-10 at 1afc977435)
 + unpack-trees: fix oneway_merge accidentally carry over stage index

 "git checkout -f <branch>" while the index has an unmerged path
 incorrectly left some paths in an unmerged state, which has been
 corrected.


* nd/checkout-m-doc-update (2019-03-21) 1 commit
  (merged to 'next' on 2019-04-10 at cdda4e833e)
 + checkout.txt: note about losing staged changes with --merge


* nd/diff-parseopt-3 (2019-03-07) 20 commits
  (merged to 'next' on 2019-03-20 at ee79d4924b)
 + diff-parseopt: convert --submodule
 + diff-parseopt: convert --ignore-submodules
 + diff-parseopt: convert --textconv
 + diff-parseopt: convert --ext-diff
 + diff-parseopt: convert --quiet
 + diff-parseopt: convert --exit-code
 + diff-parseopt: convert --color-words
 + diff-parseopt: convert --word-diff-regex
 + diff-parseopt: convert --word-diff
 + diff-parseopt: convert --[no-]color
 + diff-parseopt: convert --[no-]follow
 + diff-parseopt: convert -R
 + diff-parseopt: convert -a|--text
 + diff-parseopt: convert --full-index
 + diff-parseopt: convert --binary
 + diff-parseopt: convert --anchored
 + diff-parseopt: convert --diff-algorithm
 + diff-parseopt: convert --histogram
 + diff-parseopt: convert --patience
 + diff-parseopt: convert --[no-]indent-heuristic
 (this branch is used by nd/diff-parseopt-4.)

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


* pw/rerere-autoupdate (2019-03-18) 2 commits
  (merged to 'next' on 2019-04-10 at cf79e86682)
 + merge: tweak --rerere-autoupdate documentation
 + am/cherry-pick/rebase/revert: document --rerere-autoupdate

 Doc updates.


* sg/t5318-cleanup (2019-03-24) 1 commit
  (merged to 'next' on 2019-04-10 at 787b1b5073)
 + t5318-commit-graph: remove unused variable

 Code cleanup.


* tb/trace2-va-list-fix (2019-03-20) 1 commit
  (merged to 'next' on 2019-04-10 at 94fe0f66d8)
 + trace2: NULL is not allowed for va_list

 Fix some code that passed a NULL when a va_list was expected.


* tg/glossary-overlay (2019-03-18) 1 commit
  (merged to 'next' on 2019-04-10 at f5415c65cc)
 + glossary: add definition for overlay

 Doc update.


* tz/completion (2019-03-21) 4 commits
  (merged to 'next' on 2019-04-10 at a26ec8420f)
 + completion: use __git when calling --list-cmds
 + completion: fix multiple command removals
 + t9902: test multiple removals via completion.commands
 + git: read local config in --list-cmds

 The completion helper code now pays attention to repository-local
 configuration (when available), which allows --list-cmds to honour
 a repository specific setting of completion.commands, for example.
 cf. <20190320180329.22280-1-tmz@pobox.com> (v3)


* tz/t4038-bash-redirect-target-workaround (2019-03-18) 1 commit
  (merged to 'next' on 2019-04-10 at 9845123f19)
 + t4038-diff-combined: quote paths with whitespace

 Work-around extra warning from bash in our tests.

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

* hs/send-email-transferencoding-fix (2019-04-10) 1 commit
 - send-email: honor transferencoding config option again

 Since "git send-email" learned to take 'auto' as the value for the
 transfer-encoding, it by mistake stopped honoring the values given
 to the configuration variables sendemail.transferencoding and/or
 sendemail.<ident>.transferencoding.  Attempt to correct this.

 Not quite.
 cf. <xmqq8swi34h5.fsf@gitster-ct.c.googlers.com>


* jk/xmalloc (2019-04-12) 4 commits
 - progress: use xmalloc/xcalloc
 - xdiff: use xmalloc/xrealloc
 - xdiff: use git-compat-util
 - test-prio-queue: use xmalloc

 The code is updated to check the result of memory allocation before
 it is used in more places, by using xmalloc and/or xcalloc calls.

 Will merge to 'next'.


* js/untracked-cache-allocfix (2019-04-12) 1 commit
 - untracked cache: fix off-by-one

 An underallocation in the code to read the untracked cache
 extension has been corrected.

 Will merge to 'next'.


* km/t3000-retitle (2019-04-12) 1 commit
 - t3000 (ls-files -o): widen description to reflect current tests

 A test update.

 Will merge to 'next'.


* bc/send-email-qp-cr (2019-04-14) 1 commit
 - send-email: default to quoted-printable when CR is present

 "git send-email" has been taught to use quoted-printable when the
 payload contains carriage-return.  The use of the mechanism is in
 line with the design originally added the codepath that chooses QP
 when the payload has overly long lines.

 Will merge to 'next'.


* jc/gettext-test-fix (2019-04-15) 1 commit
 - gettext tests: export the restored GIT_TEST_GETTEXT_POISON

 The GETTEXT_POISON test option has been quite broken ever since it
 was made runtime-tunable, which has been fixed.

 Will merge to 'next'.


* jk/fetch-reachability-error-fix (2019-04-15) 7 commits
 - fetch: do not consider peeled tags as advertised tips
 - remote.c: make singular free_ref() public
 - fetch: use free_refs()
 - pkt-line: prepare buffer before handling ERR packets
 - upload-pack: send ERR packet for non-tip objects
 - t5530: check protocol response for "not our ref"
 - t5516: drop ok=sigpipe from unreachable-want tests

 Code clean-up and a fix for "git fetch" by an explicit object name
 (as opposed to fetching refs by name).

 Will merge to 'next'.


* jk/pack-objects-reports-num-objects-to-trace2 (2019-04-12) 1 commit
 - pack-objects: write objects packed to trace2

 The "git pack-objects" command learned to report the number of
 objects it packed via the trace2 mechanism.

 Will merge to 'next'.


* js/iso8895-test-on-apfs (2019-04-15) 1 commit
 - t9822: skip tests if file names cannot be ISO-8859-1 encoded

 Test fix on APFS that is incapable of store paths in Latin-1.

 Will merge to 'next'.


* js/macos-gettext-build (2019-04-15) 1 commit
 - macOS: make sure that gettext is found

 Build with gettext breaks on recent macOS w/ Homebrew when
 /usr/local/bin is not on PATH, which has been corrected.


* js/misc-doc-fixes (2019-04-15) 7 commits
 - test-tool: handle the `-C <directory>` option just like `git`
 - check-docs: do not bother checking for legacy scripts' documentation
 - SQUASH???
 - docs: exclude documentation for commands that have been excluded
 - check-docs: do not pretend that commands are listed which are excluded
 - help -a: do not list commands that are excluded from the build
 - remote-testgit: move it into the support directory for t5801
 (this branch uses js/check-docs-exe.)

 "make check-docs", "git help -a", etc. did not account for cases
 where a particular build may deliberately omit some subcommands,
 which has been corrected.

 Under review.


* nd/submodule-foreach-quiet (2019-04-15) 1 commit
 - submodule foreach: fix "<command> --quiet" not being respected

 "git submodule foreach <command> --quiet" did not pass the option
 down correctly, which has been corrected.

 Will merge to 'next'.

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

* nb/branch-show-other-worktrees-head (2019-03-18) 3 commits
 - branch: add worktree info on verbose output
 - branch: update output to include worktree info
 - 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.

 Getting there...
 cf. <20190316013807.38756-1-nbelakovski@gmail.com> (v9)
 cf. <20190318121054.GC24175@szeder.dev>


* jt/fetch-cdn-offload (2019-03-12) 9 commits
 - SQUASH???
 - upload-pack: send part of packfile response as uri
 - fetch-pack: support more than one pack lockfile
 - 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 when getting dumb HTTP 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).

 Waiting for the final 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>


* 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?


* js/protocol-advertise-multi (2018-12-28) 1 commit
 - protocol: advertise multiple supported versions

 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.

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

* bs/sendemail-tighten-anything-by (2019-04-04) 1 commit
 - send-email: don't cc *-by lines with '-' prefix

 The recently added feature to add addresses that are on
 anything-by: trailers in 'git send-email' was found to be way too
 eager and considered nonsense strings as if they can be legitimate
 beginning of *-by: trailer.  This has been tightened.

 Will merge to 'next'.


* da/smerge (2019-04-04) 2 commits
  (merged to 'next' on 2019-04-16 at 80bf79fee1)
 + contrib/completion: add smerge to the mergetool completion candidates
 + mergetools: add support for smerge (Sublime Merge)

 "git mergetool" learned to offer Sublime Merge (smerge) as one of
 its backends.

 Will merge to 'master'.


* dl/flex-str-cocci (2019-04-04) 2 commits
  (merged to 'next' on 2019-04-16 at e5cb2927b3)
 + cocci: FLEX_ALLOC_MEM to FLEX_ALLOC_STR
 + midx.c: convert FLEX_ALLOC_MEM to FLEX_ALLOC_STR

 Code clean-up.

 Will merge to 'master'.


* dl/warn-tagging-a-tag (2019-04-12) 2 commits
 - tag: advise on nested tags
 - tag: fix formatting

 "git tag" learned to give an advice suggesting it might be a
 mistake when creating an annotated or signed tag that points at
 another tag.

 Will merge to 'next'.


* jc/format-patch-delay-message-id (2019-04-05) 1 commit
 - format-patch: move message-id and related headers to the end

 The location "git format-patch --thread" adds the Message-Id:
 header in the series of header fields has been moved down, which
 may help working around a suspected bug in GMail MSA, reported at
 <CAHk-=whP1stFZNAaJiMi5eZ9rj0MRt20Y_yHVczZPH+O01d+sA@mail.gmail.com>

 Waiting for feedback to see if it truly helps.
 Needs tests.


* jk/revision-rewritten-parents-in-prio-queue (2019-04-04) 1 commit
  (merged to 'next' on 2019-04-16 at bdc1465128)
 + revision: use a prio_queue to hold rewritten parents

 Performance fix for "rev-list --parents -- pathspec".

 Will merge to 'master'.


* tb/unexpected (2019-04-10) 7 commits
 - rev-list: detect broken root trees
 - rev-list: let traversal die when --missing is not in use
 - get_commit_tree(): return NULL for broken tree
 - list-objects.c: handle unexpected non-tree entries
 - list-objects.c: handle unexpected non-blob entries
 - t: introduce tests for unexpected object types
 - t: move 'hex2oct' into test-lib-functions.sh

 Code tightening against a "wrong" object appearing where an object
 of a different type is expected, instead of blindly assuming that
 the connection between objects are correctly made.


* en/merge-directory-renames (2019-04-08) 15 commits
 - merge-recursive: switch directory rename detection default
 - merge-recursive: give callers of handle_content_merge() access to contents
 - merge-recursive: track information associated with directory renames
 - t6043: fix copied test description to match its purpose
 - merge-recursive: switch from (oid,mode) pairs to a diff_filespec
 - merge-recursive: cleanup handle_rename_* function signatures
 - merge-recursive: track branch where rename occurred in rename struct
 - merge-recursive: remove ren[12]_other fields from rename_conflict_info
 - merge-recursive: shrink rename_conflict_info
 - merge-recursive: move some struct declarations together
 - merge-recursive: use 'ci' for rename_conflict_info variable name
 - merge-recursive: rename locals 'o' and 'a' to 'obuf' and 'abuf'
 - merge-recursive: rename diff_filespec 'one' to 'o'
 - merge-recursive: rename merge_options argument from 'o' to 'opt'
 - Use 'unsigned short' for mode, like diff_filespec does

 "git merge-recursive" backend recently learned a new heuristics to
 infer file movement based on how other files in the same directory
 moved.  As this is inherently less robust heuristics than the one
 based on the content similarity of the file itself (rather than
 based on what its neighbours are doing), it sometimes gives an
 outcome unexpected by the end users.  This has been toned down to
 leave the renamed paths in higher/conflicted stages in the index so
 that the user can examine and confirm the result.

 Will merge to 'next'.


* jk/server-info-rabbit-hole (2019-04-16) 13 commits
  (merged to 'next' on 2019-04-16 at 3dded8be9a)
 + update_info_refs(): drop unused force parameter
 + server-info: drop objdirlen pointer arithmetic
 + server-info: drop nr_alloc struct member
 + server-info: use strbuf to read old info/packs file
 + server-info: simplify cleanup in parse_pack_def()
 + server-info: fix blind pointer arithmetic
 + http: simplify parsing of remote objects/info/packs
 + packfile: fix pack basename computation
 + midx: check both pack and index names for containment
 + t5319: drop useless --buffer from cat-file
 + t5319: fix bogus cat-file argument
 + pack-revindex: open index if necessary
 + packfile.h: drop extern from function declarations

 Code clean-up around a much-less-important-than-it-used-to-be
 update_server_info() funtion.

 Will merge to 'master'.


* js/rev-list-exclude-promisor-objects (2019-04-09) 1 commit
 - rev-list: exclude promisor objects at walk time

 "git rev-list --exclude-promisor-objects" learned not to bother
 enumerating all promisor objects, and instead filter these objects
 at walk time for performance.

 Getting there.
 cf. <xmqqo95f43dq.fsf@gitster-ct.c.googlers.com>


* jt/clone-server-option (2019-04-15) 4 commits
 - SQUASH???
 - clone: send server options when using protocol v2
 - SQUASH???
 - transport: die if server options are unsupported

 "git clone" learned a new --server-option option when talking over
 the protocol version 2.

 Getting there.
 cf. <xmqqk1g342xi.fsf@gitster-ct.c.googlers.com>
 cf. <20190406115728.GB219876@google.com>


* po/describe-not-necessarily-7 (2019-04-08) 1 commit
 - describe doc: remove '7-char' abbreviation reference

 Docfix.

 Will merge to 'next'.


* po/rerere-doc-fmt (2019-04-08) 1 commit
 - rerere doc: quote `rerere.enabled`

 Docfix.

 Will merge to 'next'.


* sg/blame-in-bare-start-at-head (2019-04-08) 1 commit
 - blame: default to HEAD in a bare repo when no start commit is given

 "git blame -- path" in a non-bare repository starts blaming from
 the working tree, and the same command in a bare repository errors
 out because there is no working tree by definition.  The command
 has been taught to instead start blaming from the commit at HEAD,
 which is more useful.

 Will merge to 'next'.


* tg/ls-files-debug-format-fix (2019-04-08) 1 commit
 - ls-files: use correct format string

 Debugging code fix.

 Will merge to 'next'.


* tz/doc-apostrophe-no-longer-needed (2019-04-10) 1 commit
 - Documentation/git-show-branch: avoid literal {apostrophe}

 Doc formatting fix.

 Will merge to 'next'.


* tz/git-svn-doc-markup-fix (2019-04-10) 1 commit
 - Documentation/git-svn: improve asciidoctor compatibility

 Doc formatting fix.

 Will merge to 'next'.


* js/t3301-unbreak-notes-test (2019-04-09) 1 commit
 - t3301: fix false negative

 Test fix.

 Will merge to 'next'.


* ss/msvc-path-utils-fix (2019-04-09) 1 commit
 - MSVC: include compat/win32/path-utils.h for MSVC, too, for real_path()

 An earlier update for MinGW and Cygwin accidentally broke MSVC build,
 which has been fixed.

 May want to clarify the log message?
 cf. <af640e82-ca1a-9c96-da47-62aaea1cc18e@web.de>


* tb/stash-in-c-unused-param-fix (2019-03-11) 1 commit
  (merged to 'next' on 2019-03-20 at 5ccac5f80d)
 + stash: drop unused parameter
 (this branch uses ps/stash-in-c; is tangled with js/stash-in-c-pathspec-fix and tg/stash-in-c-show-default-to-p-fix.)

 Code clean-up.

 Will merge to 'master' together with other stash-in-c topics.


* cb/doco-mono (2019-03-13) 2 commits
  (merged to 'next' on 2019-04-16 at 91f5d71452)
 + doc: format pathnames and URLs as monospace.
 + doc/CodingGuidelines: URLs and paths as monospace

 Clean-up markup in the documentation suite.

 Will merge to 'master'.


* cc/multi-promisor (2019-04-15) 17 commits
 - Move core_partial_clone_filter_default to promisor-remote.c
 - Move repository_format_partial_clone to promisor-remote.c
 - Remove fetch-object.{c,h} in favor of promisor-remote.{c,h}
 - remote: add promisor and partial clone config to the doc
 - partial-clone: add multiple remotes in the doc
 - t0410: test fetching from many promisor remotes
 - builtin/fetch: remove unique promisor remote limitation
 - promisor-remote: parse remote.*.partialclonefilter
 - diff: use promisor-remote.h instead of fetch-object.h
 - Use promisor_remote_get_direct() and has_promisor_remote()
 - promisor-remote: use repository_format_partial_clone
 - promisor-remote: add promisor_remote_reinit()
 - promisor-remote: implement promisor_remote_get_direct()
 - Add initial support for many promisor remotes
 - fetch-object: make functions return an error code
 - t0410: remove pipes after git commands
 - Merge branch 'jt/batch-fetch-blobs-in-diff' into cc/multi-promisor
 (this branch uses jt/batch-fetch-blobs-in-diff.)

 Teach the lazy clone machinery that there can be more than one
 promisor remote and consult them in order when downloading missing
 objects on demand.

 Needs review.


* nd/switch-and-restore (2019-04-12) 43 commits
 - help: move git-diff and git-reset to different groups
 - rm: add --staged as alias for --cached
 - doc: promote "git restore"
 - user-manual.txt: prefer 'merge --abort' over 'reset --hard'
 - completion: support restore
 - t: add tests for restore
 - restore: support --patch
 - restore: replace --force with --ignore-unmerged
 - restore: default to --source=HEAD when only --staged is specified
 - restore: reject invalid combinations with --staged
 - restore: add --worktree and --staged
 - checkout: factor out worktree checkout code
 - restore: disable overlay mode by default
 - restore: make pathspec mandatory
 - restore: take tree-ish from --source option instead
 - checkout: split part of it to new command 'restore'
 - doc: promote "git switch"
 - completion: support switch
 - t: add tests for switch
 - switch: make --orphan switch to an empty tree
 - switch: reject if some operation is in progress
 - switch: no worktree status unless real branch switch happens
 - switch: implicit dwim, use --no-guess to disable it
 - switch: add short option for --detach
 - switch: only allow explicit detached HEAD
 - switch: reject "do nothing" case
 - switch: stop accepting pathspec
 - switch: remove -l
 - switch: add --discard-changes
 - switch: better names for -b and -B
 - checkout: split part of it to new command 'switch'
 - checkout: split options[] array in three pieces
 - checkout: move 'confict_style' and 'dwim_..' to checkout_opts
 - checkout: make "opts" in cmd_checkout() a pointer
 - checkout: factor out some code in parse_branchname_arg()
 - checkout: keep most #include sorted
 - checkout: inform the user when removing branch state
 - checkout: advice how to get out of detached HEAD mode
 - t: rename t2014-switch.sh to t2014-checkout-switch.sh
 - git-checkout.txt: fix monospace typeset
 - doc: document --overwrite-ignore
 - git-checkout.txt: fix one syntax line
 - git-checkout.txt: spell out --no-option

 Two new commands "git switch" and "git restore" are introduced to
 split "checking out a branch to work on advancing its history" and
 "checking out paths out of the index and/or a tree-ish to work on
 advancing the current history" out of the single "git checkout"
 command.

 cf. <20190329103919.15642-1-pclouds@gmail.com> (switch v6)
 cf. <20190411131218.19195-1-pclouds@gmail.com> (restore v2)


* ab/gc-reflog (2019-04-01) 7 commits
  (merged to 'next' on 2019-04-16 at aa27f951a8)
 + gc: handle & check gc.reflogExpire config
 + reflog tests: assert lack of early exit with expiry="never"
 + reflog tests: test for the "points nowhere" warning
 + reflog tests: make use of "test_config" idiom
 + gc: refactor a "call me once" pattern
 + gc: convert to using the_hash_algo
 + gc: remove redundant check for gc_auto_threshold

 Fix various glitches in "git gc" around reflog handling.

 Will merge to 'master'.


* ew/repack-with-bitmaps-by-default (2019-03-18) 3 commits
 - pack-objects: default to writing bitmap hash-cache
 - t5310: correctly remove bitmaps for jgit test
 - repack: enable bitmaps by default on bare repos

 The connectivity bitmaps are created by default in bare
 repositories now; also the pathname hash-cache is created by
 default to avoid making crappy deltas when repacking.

 Will merge to 'next'.


* js/check-docs-exe (2019-04-01) 5 commits
  (merged to 'next' on 2019-04-16 at 98570caa8c)
 + check-docs: fix for setups where executables have an extension
 + check-docs: do not expect guide pages to correspond to commands
 + check-docs: really look at the documented commands again
 + docs: do not document the `git remote-testgit` command
 + docs: move gitremote-helpers into section 7
 (this branch is used by js/misc-doc-fixes.)

 Dev support update.

 Will merge to 'master'.


* js/difftool-no-index (2019-03-18) 3 commits
  (merged to 'next' on 2019-04-16 at 7313f9ff18)
 + difftool: allow running outside Git worktrees with --no-index
 + parse-options: make OPT_ARGUMENT() more useful
 + difftool: remove obsolete (and misleading) comment

 "git difftool" can now run outside a repository.

 Will merge to 'master'.


* pw/cherry-pick-continue (2019-03-18) 3 commits
  (merged to 'next' on 2019-04-16 at 1bfd7a7179)
 + cherry-pick --continue: remember options
 + cherry-pick: demonstrate option amnesia
 + sequencer: break some long lines

 "git cherry-pick --options A..B", after giving control back to the
 user to ask help resolving a conflicted step, did not honor the
 options it originally received, which has been corrected.

 Will merge to 'master'.


* sg/test-atexit (2019-03-14) 11 commits
  (merged to 'next' on 2019-04-10 at 7839135291)
 + t9811-git-p4-label-import: fix pipeline negation
 + git p4 test: disable '-x' tracing in the p4d watchdog loop
 + git p4 test: simplify timeout handling
 + git p4 test: clean up the p4d cleanup functions
 + git p4 test: use 'test_atexit' to kill p4d and the watchdog process
 + t0301-credential-cache: use 'test_atexit' to stop the credentials helper
 + tests: use 'test_atexit' to stop httpd
 + git-daemon: use 'test_atexit` to stop 'git-daemon'
 + test-lib: introduce 'test_atexit'
 + t/lib-git-daemon: make sure to kill the 'git-daemon' process
 + test-lib: fix interrupt handling with 'dash' and '--verbose-log -x'

 Test framework update to more robustly clean up leftover files and
 processes after tests are done.

 Will merge to 'master'.


* tg/stash-in-c-show-default-to-p-fix (2019-03-21) 1 commit
  (merged to 'next' on 2019-04-10 at 9489a31a36)
 + stash: setup default diff output format if necessary
 (this branch uses ps/stash-in-c; is tangled with js/stash-in-c-pathspec-fix and tb/stash-in-c-unused-param-fix.)

 A regression fix.

 Will merge to 'master' together with other stash-in-c topics.


* jc/format-patch-noclobber (2019-02-22) 1 commit
 - format-patch: --no-clobber refrains from overwriting output files

 Undecided but inclined to discard.


* jk/unused-params-even-more (2019-03-21) 13 commits
  (merged to 'next' on 2019-04-10 at 12edf8872f)
 + parse_opt_ref_sorting: always use with NONEG flag
 + pretty: drop unused strbuf from parse_padding_placeholder()
 + pretty: drop unused "type" parameter in needs_rfc2047_encoding()
 + parse-options: drop unused ctx parameter from show_gitcomp()
 + fetch_pack(): drop unused parameters
 + report_path_error(): drop unused prefix parameter
 + unpack-trees: drop unused error_type parameters
 + unpack-trees: drop name_entry from traverse_by_cache_tree()
 + test-date: drop unused "now" parameter from parse_dates()
 + update-index: drop unused prefix_length parameter from do_reupdate()
 + log: drop unused "len" from show_tagger()
 + log: drop unused rev_info from early output
 + revision: drop some unused "revs" parameters

 Code cleanup.

 Will merge to 'master'.


* ab/commit-graph-fixes (2019-04-01) 8 commits
  (merged to 'next' on 2019-04-16 at 97f4ba02f0)
 + commit-graph: improve & i18n error messages
 + commit-graph write: don't die if the existing graph is corrupt
 + commit-graph verify: detect inability to read the graph
 + commit-graph: don't pass filename to load_commit_graph_one_fd_st()
 + commit-graph: don't early exit(1) on e.g. "git status"
 + commit-graph: fix segfault on e.g. "git status"
 + commit-graph tests: test a graph that's too small
 + commit-graph tests: split up corrupt_graph_and_verify()

 Code cleanup with more careful error checking before using data
 read from the commit-graph file.

 Will merge to 'master'.


* ab/gc-docs (2019-04-08) 11 commits
 - gc docs: remove incorrect reference to gc.auto=0
 - gc docs: clarify that "gc" doesn't throw away referenced objects
 - gc docs: note "gc --aggressive" in "fast-import"
 - gc docs: downplay the usefulness of --aggressive
 - gc docs: note how --aggressive impacts --window & --depth
 - gc docs: fix formatting for "gc.writeCommitGraph"
 - gc docs: re-flow the "gc.*" section in "config"
 - gc docs: include the "gc.*" section from "config" in "gc"
 - gc docs: clean grammar for "gc.bigPackThreshold"
 - gc docs: stop noting "repack" flags
 - gc docs: modernize the advice for manually running "gc"

 Update docs around "gc".

 Will merge to 'next'.


* ab/test-lib-pass-trace2-env (2019-04-01) 1 commit
  (merged to 'next' on 2019-04-16 at 4dad6d6d7a)
 + test-lib: whitelist GIT_TR2_* in the environment

 Allow tracing of Git executable while running out tests.

 Will merge to 'master'.


* am/p4-branches-excludes (2019-04-02) 8 commits
 - git-p4: respect excluded paths when detecting branches
 - git-p4: add failing test for "git-p4: respect excluded paths when detecting branches"
 - git-p4: don't exclude other files with same prefix
 - git-p4: add failing test for "don't exclude other files with same prefix"
 - git-p4: don't groom exclude path list on every commit
 - git-p4: match branches case insensitively if configured
 - git-p4: add failing test for "git-p4: match branches case insensitively if configured"
 - git-p4: detect/prevent infinite loop in gitCommitByP4Change()

 "git p4" update.

 Is this ready for 'next'?


* bc/hash-transition-16 (2019-04-01) 35 commits
  (merged to 'next' on 2019-04-16 at 8227fea6fa)
 + gitweb: make hash size independent
 + Git.pm: make hash size independent
 + read-cache: read data in a hash-independent way
 + dir: make untracked cache extension hash size independent
 + builtin/difftool: use parse_oid_hex
 + refspec: make hash size independent
 + archive: convert struct archiver_args to object_id
 + builtin/get-tar-commit-id: make hash size independent
 + get-tar-commit-id: parse comment record
 + hash: add a function to lookup hash algorithm by length
 + remote-curl: make hash size independent
 + http: replace sha1_to_hex
 + http: compute hash of downloaded objects using the_hash_algo
 + http: replace hard-coded constant with the_hash_algo
 + http-walker: replace sha1_to_hex
 + http-push: remove remaining uses of sha1_to_hex
 + http-backend: allow 64-character hex names
 + http-push: convert to use the_hash_algo
 + builtin/pull: make hash-size independent
 + builtin/am: make hash size independent
 + fast-import: replace sha1_to_hex
 + fast-import: make hash-size independent
 + builtin/name-rev: make hash-size independent
 + object-store: rename and expand packed_git's sha1 member
 + notes: replace sha1_to_hex
 + notes: make hash size independent
 + notes-merge: switch to use the_hash_algo
 + submodule: avoid hard-coded constants
 + pack-bitmap: switch hash tables to use struct object_id
 + pack-bitmap: switch hard-coded constants to the_hash_algo
 + pack-bitmap: replace sha1_to_hex
 + pack-bitmap: convert struct stored_bitmap to object_id
 + pack-bitmap: make bitmap header handling hash agnostic
 + khash: move oid hash table definition
 + t/lib-submodule-update: use appropriate length constant

 Conversion from unsigned char[20] to struct object_id continues.

 Will merge to 'master'.


* cc/replace-graft-peel-tags (2019-04-15) 4 commits
 - replace: peel tag when passing a tag first to --graft
 - replace: peel tag when passing a tag as parent to --graft
 - t6050: redirect expected error output to a file
 - t6050: use test_line_count instead of wc -l

 When given a tag that points at a commit-ish, "git replace --graft"
 failed to peel the tag before writing a replace ref, which did not
 make sense because the old graft mechanism the feature wants to
 mimick only allowed to replace one commit object with another.
 This has been fixed.

 Will merge to 'next'.


* dk/blame-keep-origin-blob (2019-04-03) 1 commit
  (merged to 'next' on 2019-04-16 at 39679dde8b)
 + blame.c: don't drop origin blobs as eagerly

 Performance fix around "git blame", especially in a linear history
 (which is the norm we should optimize for).

 Will merge to 'master'.


* dl/rebase-i-keep-base (2019-04-16) 6 commits
 - rebase: teach rebase --keep-base
 - rebase: fast-forward --fork-point in more cases
 - rebase: fast-forward --onto in more cases
 - t3432: test rebase fast-forward behavior
 - t3431: add rebase --fork-point tests
 + tests (rebase): spell out the `--keep-empty` option
 (this branch is tangled with js/spell-out-options-in-tests.)

 "git rebase --keep-base <upstream>" tries to find the original base
 of the topic being rebased and rebase on top of that same base, which
 is useful when running the "git rebase -i" (and its limited variant
 "git rebase -x").

 Will merge to 'next'.


* en/fast-import-parsing-fix (2019-04-01) 5 commits
  (merged to 'next' on 2019-04-16 at b318831bde)
 + fast-import: fix erroneous handling of get-mark with empty orphan commits
 + fast-import: only allow cat-blob requests where it makes sense
 + fast-import: check most prominent commands first
 + git-fast-import.txt: fix wording about where ls command can appear
 + t9300: demonstrate bug with get-mark and empty orphan commits

 "git fast-import" update.

 Will merge to 'master'.


* jh/trace2-sid-fix (2019-04-16) 10 commits
 - trace2: update docs to describe system/global config settings
 - trace2: make SIDs more unique
 - trace2: clarify UTC datetime formatting
 - trace2: report peak memory usage of the process
 - trace2: use system/global config for default trace2 settings
 - config: add read_very_early_config()
 - trace2: find exec-dir before trace2 initialization
 - trace2: add absolute elapsed time to start event
 - trace2: refactor setting process starting time
 - config: initialize opts structure in repo_read_config()

 Polishing of the new trace2 facility continues.  The system-level
 configuration can specify site-wide trace2 settings, which can be
 overridden with per-user configuration and environment variables.

 Will merge to 'next'.
 cf. <pull.169.v4.git.gitgitgadget@gmail.com> (v4)


* js/spell-out-options-in-tests (2019-04-15) 8 commits
  (merged to 'next' on 2019-04-16 at 1cfd7698b6)
 + tests: disallow the use of abbreviated options (by default)
 + tests (pack-objects): use the full, unabbreviated `--revs` option
 + tests (status): spell out the `--find-renames` option in full
 + tests (push): do not abbreviate the `--follow-tags` option
 + t5531: avoid using an abbreviated option
 + t7810: do not abbreviate `--no-exclude-standard` nor `--invert-match`
 + tests (rebase): spell out the `--force-rebase` option
 + tests (rebase): spell out the `--keep-empty` option
 (this branch is tangled with dl/rebase-i-keep-base.)

 The tests have been updated not to rely on the abbreviated option
 names the parse-options API offers, to protect us from an
 abbreviated form of an option that used to be unique within the
 command getting non-unique when a new option that share the same
 prefix is added.

 Will merge to 'master'.


* js/trace2-to-directory (2019-03-22) 1 commit
 - trace2: write to directory targets

 The trace2 tracing facility learned to auto-generate a filename
 when told to log to a directory.

 Ready for 'next'; giving the last chance to be intercepted.
 cf. <20190408211850.GJ60888@google.com>


* jt/batch-fetch-blobs-in-diff (2019-04-08) 2 commits
 - diff: batch fetching of missing blobs
 - sha1-file: support OBJECT_INFO_FOR_PREFETCH
 (this branch is used by cc/multi-promisor.)

 While running "git diff" in a lazy clone, we can upfront know which
 missing blobs we will need, instead of waiting for the on-demand
 machinery to discover them one by one.  Aim to achieve better
 performance by batching the request for these promised blobs.

 Will merge to 'next'.


* jt/fetch-no-update-shallow-in-proto-v2 (2019-04-01) 3 commits
  (merged to 'next' on 2019-04-16 at 05c5ebe471)
 + fetch-pack: respect --no-update-shallow in v2
 + fetch-pack: call prepare_shallow_info only if v0
 + Merge branch 'jt/test-protocol-version' into jt/fetch-no-update-shallow-in-proto-v2

 Fix for protocol v2 support in "git fetch-pack" of shallow clones.

 Will merge to 'master'.


* jt/fetch-pack-wanted-refs-optim (2019-04-01) 1 commit
  (merged to 'next' on 2019-04-16 at 051f6bd38a)
 + fetch-pack: binary search when storing wanted-refs

 Performance fix around "git fetch" that grabs many refs.

 Will merge to 'master'.


* km/empty-repo-is-still-a-repo (2019-04-10) 3 commits
 - add: error appropriately on repository with no commits
 - dir: do not traverse repositories with no commits
 - submodule: refuse to add repository with no commits

 Running "git add" on a repository created inside the current
 repository is an explicit indication that the user wants to add it
 as a submodule, but when the HEAD of the inner repository is on an
 unborn branch, it cannot be added as a submodule.  Worse, the files
 in its working tree can be added as if they are a part of the outer
 repository, which is not what the user wants.  These problems are
 being addressed.

 Will merge to 'next'.


* nd/checkout-m (2019-03-24) 4 commits
  (merged to 'next' on 2019-04-16 at 4d7c322bed)
 + checkout: prevent losing staged changes with --merge
 + read-tree: add --quiet
 + unpack-trees: rename "gently" flag to "quiet"
 + unpack-trees: keep gently check inside add_rejected_path

 "git checkout -m <other>" was about carrying the differences
 between HEAD and the working-tree files forward while checking out
 another branch, and ignored the differences between HEAD and the
 index.  The command has been taught to abort when the index and the
 HEAD are different.

 Will merge to 'master'.


* nd/commit-a-with-paths-msg-update (2019-03-22) 1 commit
  (merged to 'next' on 2019-04-16 at a36c712b39)
 + commit: improve error message in "-a <paths>" case

 The message given when "git commit -a <paths>" errors out has been
 updated.

 Will merge to 'master'.


* nd/diff-parseopt-4 (2019-03-24) 20 commits
  (merged to 'next' on 2019-04-10 at 893b135f10)
 + am: avoid diff_opt_parse()
 + diff --no-index: use parse_options() instead of diff_opt_parse()
 + range-diff: use parse_options() instead of diff_opt_parse()
 + diff.c: allow --no-color-moved-ws
 + diff-parseopt: convert --color-moved-ws
 + diff-parseopt: convert --[no-]color-moved
 + diff-parseopt: convert --inter-hunk-context
 + diff-parseopt: convert --no-prefix
 + diff-parseopt: convert --line-prefix
 + diff-parseopt: convert --[src|dst]-prefix
 + diff-parseopt: convert --[no-]abbrev
 + diff-parseopt: convert --diff-filter
 + diff-parseopt: convert --find-object
 + diff-parseopt: convert -O
 + diff-parseopt: convert --pickaxe-all|--pickaxe-regex
 + diff-parseopt: convert -S|-G
 + diff-parseopt: convert -l
 + diff-parseopt: convert -z
 + diff-parseopt: convert --ita-[in]visible-in-index
 + diff-parseopt: convert --ws-error-highlight

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

 Will merge to 'master'.


* nd/include-if-wildmatch (2019-04-01) 1 commit
  (merged to 'next' on 2019-04-16 at db8b6a578a)
 + config: correct '**' matching in includeIf patterns

 A buglet in configuration parser has been fixed.

 Will merge to 'master'.


* nd/interpret-trailers-docfix (2019-04-01) 1 commit
  (merged to 'next' on 2019-04-16 at 6a57abc7e6)
 + interpret-trailers.txt: start the desc line with a capital letter

 Doc update.

 Will merge to 'master'.


* nd/precious (2019-04-09) 1 commit
 - Introduce "precious" file concept

 "git clean" learned to pay attention to the 'precious' attributes
 and keep untracked paths with the attribute instead of removing
 when the "--keep-precious" is given.

 Will merge to 'next'.


* nd/read-tree-reset-doc (2019-04-02) 1 commit
  (merged to 'next' on 2019-04-16 at f2bef91774)
 + read-tree.txt: clarify --reset and worktree changes

 The documentation for "git read-tree --reset -u" has been updated.

 Will merge to 'master'.


* nd/sha1-name-c-wo-the-repository (2019-04-16) 34 commits
 - sha1-name.c: remove the_repo from get_oid_mb()
 - sha1-name.c: remove the_repo from other get_oid_*
 - sha1-name.c: remove the_repo from maybe_die_on_misspelt_object_name
 - submodule-config.c: use repo_get_oid for reading .gitmodules
 - sha1-name.c: add repo_get_oid()
 - sha1-name.c: remove the_repo from get_oid_with_context_1()
 - sha1-name.c: remove the_repo from resolve_relative_path()
 - sha1-name.c: remove the_repo from diagnose_invalid_index_path()
 - sha1-name.c: remove the_repo from handle_one_ref()
 - sha1-name.c: remove the_repo from get_oid_1()
 - sha1-name.c: remove the_repo from get_oid_basic()
 - sha1-name.c: remove the_repo from get_describe_name()
 - sha1-name.c: remove the_repo from get_oid_oneline()
 - sha1-name.c: add repo_interpret_branch_name()
 - sha1-name.c: remove the_repo from interpret_branch_mark()
 - sha1-name.c: remove the_repo from interpret_nth_prior_checkout()
 - sha1-name.c: remove the_repo from get_short_oid()
 - sha1-name.c: add repo_for_each_abbrev()
 - sha1-name.c: store and use repo in struct disambiguate_state
 - sha1-name.c: add repo_find_unique_abbrev_r()
 - sha1-name.c: remove the_repo from find_abbrev_len_packed()
 - sha1-name.c: remove the_repo from sort_ambiguous()
 - commit.c: add repo_get_commit_tree()
 - commit.cocci: refactor code, avoid double rewrite
 - refs.c: remove the_repo from read_ref_at()
 - refs.c: add repo_dwim_log()
 - refs.c: add repo_dwim_ref()
 - refs.c: remove the_repo from expand_ref()
 - refs.c: remove the_repo from substitute_branch_name()
 - refs.c: add refs_shorten_unambiguous_ref()
 - refs.c: add refs_ref_exists()
 - packfile.c: add repo_approximate_object_count()
 - builtin rebase: use oideq()
 - builtin rebase: use FREE_AND_NULL

 Further code clean-up to allow the lowest level of name-to-object
 mapping layer to work with a passed-in repository other than the
 default one.

 Will merge to 'next'.


* pw/rebase-i-internal-rfc (2019-03-21) 12 commits
 - rebase -i: run without forking rebase--interactive
 - rebase: use a common action enum
 - rebase -i: use struct rebase_options in do_interactive_rebase()
 - rebase -i: use struct rebase_options to parse args
 - rebase -i: use struct object_id for squash_onto
 - rebase -i: use struct commit when parsing options
 - rebase -i: remove duplication
 - rebase -i: combine rebase--interactive.c with rebase.c
 - rebase: use OPT_RERERE_AUTOUPDATE()
 - rebase: rename write_basic_state()
 - sequencer: always discard index after checkout
 - Merge branch 'ag/sequencer-reduce-rewriting-todo' into pw/rebase-i-internal-rfc
 (this branch uses ag/sequencer-reduce-rewriting-todo.)

 The internal implementation of "git rebase -i" has been updated to
 avoid forking a separate "rebase--interactive" process.

 Comments?  Is this ready?


* sg/asciidoctor-in-ci (2019-04-05) 6 commits
  (merged to 'next' on 2019-04-16 at efdf919c16)
 + ci: fix AsciiDoc/Asciidoctor stderr check in the documentation build job
 + ci: stick with Asciidoctor v1.5.8 for now
 + ci: install Asciidoctor in 'ci/install-dependencies.sh'
 + Documentation/technical/protocol-v2.txt: fix formatting
 + Documentation/technical/api-config.txt: fix formatting
 + Documentation/git-diff-tree.txt: fix formatting

 Update our support to format documentation in the CI environment,
 either with AsciiDoc ro Asciidoctor.

 Will merge to 'master'.


* sg/index-pack-progress (2019-04-01) 1 commit
  (merged to 'next' on 2019-04-16 at a10bfdd950)
 + index-pack: show progress while checking objects

 A progress indicator has been added to the "index-pack" step, which
 often makes users wait for completion during "git clone".

 Will merge to 'master'.


* sg/overlong-progress-fix (2019-04-15) 4 commits
 - progress: break too long progress bar lines
 - progress: clear previous progress update dynamically
 - progress: assemble percentage and counters in a strbuf before printing
 - progress: make display_progress() return void

 Updating the display with progress message has been cleaned up to
 deal better with overlong messages.

 Will merge to 'next'.


* tz/asciidoctor-fixes (2019-04-01) 2 commits
  (merged to 'next' on 2019-04-16 at 0cb17f579b)
 + Documentation/git-status: fix titles in porcelain v2 section
 + Documentation/rev-list-options: wrap --date=<format> block with "--"

 Doc updates.

 Will merge to 'master'.


* js/stash-in-c-pathspec-fix (2019-03-12) 3 commits
  (merged to 'next' on 2019-03-20 at e81d08af7a)
 + stash: pass pathspec as pointer
 + built-in stash: handle :(glob) pathspecs again
 + legacy stash: fix "rudimentary backport of -q"
 (this branch uses ps/stash-in-c; is tangled with tb/stash-in-c-unused-param-fix and tg/stash-in-c-show-default-to-p-fix.)

 Further fixes to "git stash" reimplemented in C.

 Will merge to 'master' together with other stash-in-c topics.


* nd/worktree-name-sanitization (2019-03-20) 2 commits
 - SQUASH???
 - worktree add: sanitize worktree names

 In recent versions of Git, per-worktree refs are exposed in
 refs/worktrees/<wtname>/ hierarchy, which means that worktree names
 must be a valid refname component.  The code now sanitizes the names
 given to worktrees, to make sure these refs are well-formed.


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

 Originally merged to 'next' on 2019-02-23

 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/submodule-set-branch (2019-04-10) 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.

 Will merge to 'next'.


* 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>


* 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'.


* br/blame-ignore (2019-04-14) 6 commits
 - blame: use a fingerprint heuristic to match ignored lines
 - blame: optionally track line fingerprints during fill_blame_origin()
 - blame: add config options to handle output for 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.

 Under discussion.
 cf. <8736mtqy9n.fsf@fencepost.gnu.org>
 cf. <6752a735-2e7b-7d13-799f-a42e6995498c@google.com>


* 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.


* dl/merge-cleanup-scissors-fix (2019-03-21) 11 commits
 - cherry-pick/revert: add scissors line on merge conflict
 - sequencer.c: define describe_cleanup_mode
 - merge: add scissors line on merge conflict
 - merge: cleanup messages like commit
 - sequencer.c: remove duplicate code
 - parse-options.h: extract common --cleanup option
 - commit: extract cleanup_mode functions to sequencer
 - t7502: clean up style
 - t7604: clean up style
 - t3507: clean up style
 - t7600: clean up style

 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.

 Needs review.
 Expecting a reroll.
 cf. <cover.1553150827.git.liu.denton@gmail.com> (v9)
 cf. <20190409182247.GA7317@dev-l>


* 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.


* ag/sequencer-reduce-rewriting-todo (2019-03-07) 18 commits
  (merged to 'next' on 2019-04-10 at 7eab7c7800)
 + rebase--interactive: move transform_todo_file()
 + 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
 + rebase--interactive: move rearrange_squash_in_todo_file()
 + rebase--interactive: move sequencer_add_exec_commands()
 + 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()
 (this branch is used by pw/rebase-i-internal-rfc.)

 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.

 Will merge to 'master'.
 cf. <20190305191805.13561-1-alban.gruin@gmail.com> (v8)


* ps/stash-in-c (2019-03-07) 29 commits
  (merged to 'next' on 2019-03-11 at f568e3be72)
 + 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: don't require calling prepare_fallback_ident first
 + 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'
 (this branch is used by js/stash-in-c-pathspec-fix, tb/stash-in-c-unused-param-fix and tg/stash-in-c-show-default-to-p-fix.)

 Originally merged to 'next' on 2019-03-07

 "git stash" rewritten in C.

 Will merge to 'master' together with other stash-in-c topics.

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

* Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)
  2019-04-16 13:19 What's cooking in git.git (Apr 2019, #03; Tue, 16) Junio C Hamano
@ 2019-04-16 14:51 ` Ævar Arnfjörð Bjarmason
  2019-04-16 15:26   ` Junio C Hamano
                     ` (2 more replies)
  2019-04-16 15:27 ` Ben Peart
                   ` (6 subsequent siblings)
  7 siblings, 3 replies; 24+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2019-04-16 14:51 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git, Duy Nguyen, Phillip Wood, Derrick Stolee, Eric Wong


On Tue, Apr 16 2019, Junio C Hamano wrote:


> * jc/gettext-test-fix (2019-04-15) 1 commit
>  - gettext tests: export the restored GIT_TEST_GETTEXT_POISON
>
>  The GETTEXT_POISON test option has been quite broken ever since it
>  was made runtime-tunable, which has been fixed.
>
>  Will merge to 'next'.

LGTM, but AFAICT this patch of yours never got sent to the list,
oversight?

> * 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?

I have not used this myself, but skimmed the patches. My 0.02: Seems
safe to integrate since it's fairly well-tested at MSFT & off by
default.

> * ew/repack-with-bitmaps-by-default (2019-03-18) 3 commits
>  - pack-objects: default to writing bitmap hash-cache
>  - t5310: correctly remove bitmaps for jgit test
>  - repack: enable bitmaps by default on bare repos
>
>  The connectivity bitmaps are created by default in bare
>  repositories now; also the pathname hash-cache is created by
>  default to avoid making crappy deltas when repacking.
>
>  Will merge to 'next'.

Pushing *from* a bare repo isn't going to be super common (although
stuff like server->server replication...). The case I reported in
https://public-inbox.org/git/87zhoz8b9o.fsf@evledraar.gmail.com/ will
result in some users seeing a huge slowdown due to this in some
cases.

I'm inclined to hold that sort of thing off until we get that sorted out
/ perf tested. It taking ~2m instead of ~500ms sucks pretty badly (in my
test-case).

> * ab/gc-docs (2019-04-08) 11 commits
>  - gc docs: remove incorrect reference to gc.auto=0
>  - gc docs: clarify that "gc" doesn't throw away referenced objects
>  - gc docs: note "gc --aggressive" in "fast-import"
>  - gc docs: downplay the usefulness of --aggressive
>  - gc docs: note how --aggressive impacts --window & --depth
>  - gc docs: fix formatting for "gc.writeCommitGraph"
>  - gc docs: re-flow the "gc.*" section in "config"
>  - gc docs: include the "gc.*" section from "config" in "gc"
>  - gc docs: clean grammar for "gc.bigPackThreshold"
>  - gc docs: stop noting "repack" flags
>  - gc docs: modernize the advice for manually running "gc"
>
>  Update docs around "gc".
>
>  Will merge to 'next'.

Any chance on making that s/next/master/ sooner than later?

It's just doc changes so I think the usual "let's cook in next..." has
less value, and I have some follow-ups I'd like to submit sooner than
later without me/you dealing with conflicts.

If not, no problem :)

> * nd/precious (2019-04-09) 1 commit
>  - Introduce "precious" file concept
>
>  "git clean" learned to pay attention to the 'precious' attributes
>  and keep untracked paths with the attribute instead of removing
>  when the "--keep-precious" is given.
>
>  Will merge to 'next'.

Duy had a message about this in
https://public-inbox.org/git/CACsJy8AEZ-Lz6zgEsuNukvphB9TTa9FAC1gK05fhnie2xtfc9w@mail.gmail.com/

If that was just a "I don't have time to deal with Ævar's deluge of
comments" (sorry!) I'm happy to re-roll with the nits I had if anyone
thinks those make sense (doc & test adjustments...).

But that note is terse, not sure if it means "let's drop this no matter
what" (for reasons...), ..., Duy?

> * nd/diff-parseopt-4 (2019-03-24) 20 commits
> [...]
>  + diff-parseopt: convert --[no-]abbrev
> [...]
>  Will merge to 'master'.

Have some stuff I meant to re-roll conflicting with this, will be good
to have it in master.

> * pw/rebase-i-internal-rfc (2019-03-21) 12 commits
>  - rebase -i: run without forking rebase--interactive
>  - rebase: use a common action enum
>  - rebase -i: use struct rebase_options in do_interactive_rebase()
>  - rebase -i: use struct rebase_options to parse args
>  - rebase -i: use struct object_id for squash_onto
>  - rebase -i: use struct commit when parsing options
>  - rebase -i: remove duplication
>  - rebase -i: combine rebase--interactive.c with rebase.c
>  - rebase: use OPT_RERERE_AUTOUPDATE()
>  - rebase: rename write_basic_state()
>  - sequencer: always discard index after checkout
>  - Merge branch 'ag/sequencer-reduce-rewriting-todo' into pw/rebase-i-internal-rfc
>  (this branch uses ag/sequencer-reduce-rewriting-todo.)
>
>  The internal implementation of "git rebase -i" has been updated to
>  avoid forking a separate "rebase--interactive" process.
>
>  Comments?  Is this ready?

I gave this some stress testing/review in your infra, works for me so
far, and a good performance improvement.

My only problem with it is that the commit message doesn't note just
quite how awesome it is, but I can live with that :)

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

* Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)
  2019-04-16 14:51 ` Ævar Arnfjörð Bjarmason
@ 2019-04-16 15:26   ` Junio C Hamano
  2019-04-17  7:18     ` Ævar Arnfjörð Bjarmason
  2019-04-17  9:33   ` Duy Nguyen
  2019-04-17  9:52   ` Phillip Wood
  2 siblings, 1 reply; 24+ messages in thread
From: Junio C Hamano @ 2019-04-16 15:26 UTC (permalink / raw)
  To: Ævar Arnfjörð Bjarmason
  Cc: git, Duy Nguyen, Phillip Wood, Derrick Stolee, Eric Wong

Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:

> On Tue, Apr 16 2019, Junio C Hamano wrote:
>
>
>> * jc/gettext-test-fix (2019-04-15) 1 commit
>>  - gettext tests: export the restored GIT_TEST_GETTEXT_POISON
>>
>>  The GETTEXT_POISON test option has been quite broken ever since it
>>  was made runtime-tunable, which has been fixed.
>>
>>  Will merge to 'next'.
>
> LGTM, but AFAICT this patch of yours never got sent to the list,
> oversight?

I am reasonably sure that
<xmqqlg0bvppc.fsf_-_@gitster-ct.c.googlers.com> was sent with you on
CC: line.


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

* Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)
  2019-04-16 13:19 What's cooking in git.git (Apr 2019, #03; Tue, 16) Junio C Hamano
  2019-04-16 14:51 ` Ævar Arnfjörð Bjarmason
@ 2019-04-16 15:27 ` Ben Peart
  2019-04-17  2:37   ` Junio C Hamano
  2019-04-16 16:25 ` Stalled ds/ branches (was What's cooking in git.git (Apr 2019, #03; Tue, 16)) Derrick Stolee
                   ` (5 subsequent siblings)
  7 siblings, 1 reply; 24+ messages in thread
From: Ben Peart @ 2019-04-16 15:27 UTC (permalink / raw)
  To: Junio C Hamano, git



On 4/16/2019 9:19 AM, Junio C Hamano wrote:
> 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.
> 
> Yet another batch of ~30 topics have graduated to 'master', and
> 'next' has also gained ~25 topics.  We may want to start merging
> down fixes to 'maint' for a 2.21.1.
> 
> 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
> 
> --------------------------------------------------

<snip>

> * bp/post-index-change-hook (2019-02-15) 1 commit
>    (merged to 'next' on 2019-03-11 at cb96d1d7c4)
>   + read-cache: add post-index-change hook
> 
>   Originally merged to 'next' on 2019-02-23
> 
>   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'.
> 
> 

Anything in particular this is waiting for?  I'm unaware of any requests 
for a re-roll. If something is needed, please let me know.

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

* Stalled ds/ branches (was What's cooking in git.git (Apr 2019, #03; Tue, 16))
  2019-04-16 13:19 What's cooking in git.git (Apr 2019, #03; Tue, 16) Junio C Hamano
  2019-04-16 14:51 ` Ævar Arnfjörð Bjarmason
  2019-04-16 15:27 ` Ben Peart
@ 2019-04-16 16:25 ` Derrick Stolee
  2019-04-16 17:32 ` jt/clone-server-option " Jonathan Tan
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 24+ messages in thread
From: Derrick Stolee @ 2019-04-16 16:25 UTC (permalink / raw)
  To: Junio C Hamano, git

On 4/16/2019 9:19 AM, Junio C Hamano wrote:

> * 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?

I'll be back to work full-time next week, and I have some ideas
to update this command. Specifically, the 'repack' command can
be improved in a few ways. I will elaborate on-thread when I
send a new version.

> * 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'.

Sorry for the issues colliding with other topics. I'll send a
new version next week that will resolve the conflicts. Hopefully
I can do this without needing to update the base commit.

Thanks,
-Stolee



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

* jt/clone-server-option (was What's cooking in git.git (Apr 2019, #03; Tue, 16))
  2019-04-16 13:19 What's cooking in git.git (Apr 2019, #03; Tue, 16) Junio C Hamano
                   ` (2 preceding siblings ...)
  2019-04-16 16:25 ` Stalled ds/ branches (was What's cooking in git.git (Apr 2019, #03; Tue, 16)) Derrick Stolee
@ 2019-04-16 17:32 ` Jonathan Tan
  2019-04-17  2:39   ` Junio C Hamano
  2019-04-17  2:37 ` What's cooking in git.git (Apr 2019, #03; Tue, 16) Taylor Blau
                   ` (3 subsequent siblings)
  7 siblings, 1 reply; 24+ messages in thread
From: Jonathan Tan @ 2019-04-16 17:32 UTC (permalink / raw)
  To: gitster; +Cc: git, Jonathan Tan

> * jt/clone-server-option (2019-04-15) 4 commits
>  - SQUASH???
>  - clone: send server options when using protocol v2
>  - SQUASH???
>  - transport: die if server options are unsupported
> 
>  "git clone" learned a new --server-option option when talking over
>  the protocol version 2.
>
>  Getting there.

With the two "SQUASH???" commits, I think that all outstanding comments
have been addressed, and Jonathan Nieder has given his Reviewed-by [1]
[2].

[1] https://public-inbox.org/git/20190409204525.GA92879@google.com/
[2] https://public-inbox.org/git/20190409204616.GB92879@google.com/

I understand that the following references are not exhaustive (in
particular, Szeder made some comments too), but I'll address them:

>  cf. <xmqqk1g342xi.fsf@gitster-ct.c.googlers.com>

This was about (1) what happens if the given option is not understood by
the protocol-v2-supporting other side, and (2) what happens if protocol
v2 is not used.

For (2), I have made the client die upon Jonathan Nieder's suggestion,
similar to what "git push" does when the other side does not support
push options. For (1), I have documented (in Documentation/ and in the
commit message) that handling of server options are server-specific,
just like push options (which are just sent directly to hooks).

>  cf. <20190406115728.GB219876@google.com>

This was about (1) giving an example of what a server option can be used
for, (2) using NODUP instead of DUP, and (3) a long line. (2) and (3)
have been changed. As for (1), I replied in [3] that since it is
server-specific, I don't think I can give a meaningful example.

[3] https://public-inbox.org/git/20190408171149.125872-1-jonathantanmy@google.com/

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

* Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)
  2019-04-16 13:19 What's cooking in git.git (Apr 2019, #03; Tue, 16) Junio C Hamano
                   ` (3 preceding siblings ...)
  2019-04-16 17:32 ` jt/clone-server-option " Jonathan Tan
@ 2019-04-17  2:37 ` Taylor Blau
  2019-04-17  5:38   ` Junio C Hamano
  2019-04-17 12:50 ` jc/format-patch-error-check, was " Johannes Schindelin
                   ` (2 subsequent siblings)
  7 siblings, 1 reply; 24+ messages in thread
From: Taylor Blau @ 2019-04-17  2:37 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

Hi Junio,

On Tue, Apr 16, 2019 at 10:19:45PM +0900, Junio C Hamano wrote:
> * tb/unexpected (2019-04-10) 7 commits
>  - rev-list: detect broken root trees
>  - rev-list: let traversal die when --missing is not in use
>  - get_commit_tree(): return NULL for broken tree
>  - list-objects.c: handle unexpected non-tree entries
>  - list-objects.c: handle unexpected non-blob entries
>  - t: introduce tests for unexpected object types
>  - t: move 'hex2oct' into test-lib-functions.sh
>
>  Code tightening against a "wrong" object appearing where an object
>  of a different type is expected, instead of blindly assuming that
>  the connection between objects are correctly made.

I sent a re-roll of this series in [1], which should be ready for
'next' if you feel comfortable queueing it.

Thanks,
Taylor

[1]: https://public-inbox.org/git/cover.1554861974.git.me@ttaylorr.com/

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

* Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)
  2019-04-16 15:27 ` Ben Peart
@ 2019-04-17  2:37   ` Junio C Hamano
  0 siblings, 0 replies; 24+ messages in thread
From: Junio C Hamano @ 2019-04-17  2:37 UTC (permalink / raw)
  To: Ben Peart; +Cc: git

Ben Peart <peartben@gmail.com> writes:

>> * bp/post-index-change-hook (2019-02-15) 1 commit
>>    (merged to 'next' on 2019-03-11 at cb96d1d7c4)
>>   + read-cache: add post-index-change hook
>>
>>   Originally merged to 'next' on 2019-02-23
>>
>>   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'.
>
> Anything in particular this is waiting for?

The second user, other than the originating party, who jumps up and
down asking for it to be in the upcoming release, preferrably with
their own use case to reenforce the justification why it is a good
idea to have the hook.  

That is what I've been hoping to see, so that I can point fingers at
you and that second person when it turns out that the hook was a bad
idea for whatever reason ;-)

Not that any feature must have support from multiple parties.  It
was just that waiting for the second one was the easiest way to
gauge the interest.

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

* Re: jt/clone-server-option (was What's cooking in git.git (Apr 2019, #03; Tue, 16))
  2019-04-16 17:32 ` jt/clone-server-option " Jonathan Tan
@ 2019-04-17  2:39   ` Junio C Hamano
  2019-04-17 16:18     ` Jonathan Tan
  0 siblings, 1 reply; 24+ messages in thread
From: Junio C Hamano @ 2019-04-17  2:39 UTC (permalink / raw)
  To: Jonathan Tan; +Cc: git

Jonathan Tan <jonathantanmy@google.com> writes:

>> * jt/clone-server-option (2019-04-15) 4 commits
>>  - SQUASH???
>>  - clone: send server options when using protocol v2
>>  - SQUASH???
>>  - transport: die if server options are unsupported
>> 
>>  "git clone" learned a new --server-option option when talking over
>>  the protocol version 2.
>>
>>  Getting there.
>
> With the two "SQUASH???" commits, I think that all outstanding comments
> have been addressed, and Jonathan Nieder has given his Reviewed-by [1]
> [2].

OK, so do you want me to do the squashing or are you sending the
final version with jrnieder's reviewd-by's?  Either is fine, but
I need to know to avoid waiting for an update that will not come.


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

* Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)
  2019-04-17  2:37 ` What's cooking in git.git (Apr 2019, #03; Tue, 16) Taylor Blau
@ 2019-04-17  5:38   ` Junio C Hamano
  2019-04-17  5:42     ` Taylor Blau
  0 siblings, 1 reply; 24+ messages in thread
From: Junio C Hamano @ 2019-04-17  5:38 UTC (permalink / raw)
  To: Taylor Blau; +Cc: git

Taylor Blau <me@ttaylorr.com> writes:

> Hi Junio,
>
> On Tue, Apr 16, 2019 at 10:19:45PM +0900, Junio C Hamano wrote:
>> * tb/unexpected (2019-04-10) 7 commits
>> ...
>>  Code tightening against a "wrong" object appearing where an object
>>  of a different type is expected, instead of blindly assuming that
>>  the connection between objects are correctly made.
>
> I sent a re-roll of this series in [1], which should be ready for
> 'next' if you feel comfortable queueing it.
>
> [1]: https://public-inbox.org/git/cover.1554861974.git.me@ttaylorr.com/

That's this one

    Date: Tue, 9 Apr 2019 19:13:06 -0700 (1 week, 3 hours, 23 minutes ago)
    Subject: [PATCH v2 0/7] harden unexpected object types checks

which I think is what has been queued and what is listed in the
message you are responding to.

Do you mean you have even newer ones?

Thanks.


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

* Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)
  2019-04-17  5:38   ` Junio C Hamano
@ 2019-04-17  5:42     ` Taylor Blau
  2019-04-17  6:14       ` Junio C Hamano
  0 siblings, 1 reply; 24+ messages in thread
From: Taylor Blau @ 2019-04-17  5:42 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: Taylor Blau, git

On Wed, Apr 17, 2019 at 02:38:34PM +0900, Junio C Hamano wrote:
> Taylor Blau <me@ttaylorr.com> writes:
>
> > Hi Junio,
> >
> > On Tue, Apr 16, 2019 at 10:19:45PM +0900, Junio C Hamano wrote:
> >> * tb/unexpected (2019-04-10) 7 commits
> >> ...
> >>  Code tightening against a "wrong" object appearing where an object
> >>  of a different type is expected, instead of blindly assuming that
> >>  the connection between objects are correctly made.
> >
> > I sent a re-roll of this series in [1], which should be ready for
> > 'next' if you feel comfortable queueing it.
> >
> > [1]: https://public-inbox.org/git/cover.1554861974.git.me@ttaylorr.com/
>
> That's this one
>
>     Date: Tue, 9 Apr 2019 19:13:06 -0700 (1 week, 3 hours, 23 minutes ago)
>     Subject: [PATCH v2 0/7] harden unexpected object types checks
>
> which I think is what has been queued and what is listed in the
> message you are responding to.

Ah, perhaps you could clarify some confusion I have about the "What's
Cooking" emails (or at least point me somewhere I could un-confuse
myself).

This topic is in the "Cooking" section with a "-" (which I recall means
that it's in 'pu'), but there is no "Will merge to ..." line below it
from you.

That makes sense to me, but I'm not sure whether or not that means it's
queued. Do you say that a topic is queued once it's on your pu, or once
you have written "Will merge to..."?

Thanks in advance for your clarification.

> Do you mean you have even newer ones?

No, those are the latest.

> Thanks.
>
Thanks,
Taylor

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

* Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)
  2019-04-17  5:42     ` Taylor Blau
@ 2019-04-17  6:14       ` Junio C Hamano
  2019-04-18  6:54         ` Taylor Blau
  0 siblings, 1 reply; 24+ messages in thread
From: Junio C Hamano @ 2019-04-17  6:14 UTC (permalink / raw)
  To: Taylor Blau; +Cc: git

Taylor Blau <me@ttaylorr.com> writes:

>> That's this one
>>
>>     Date: Tue, 9 Apr 2019 19:13:06 -0700 (1 week, 3 hours, 23 minutes ago)
>>     Subject: [PATCH v2 0/7] harden unexpected object types checks
>>
>> which I think is what has been queued and what is listed in the
>> message you are responding to.
>
> Ah, perhaps you could clarify some confusion I have about the "What's
> Cooking" emails (or at least point me somewhere I could un-confuse
> myself).
>
> This topic is in the "Cooking" section with a "-" (which I recall means
> that it's in 'pu'), but there is no "Will merge to ..." line below it
> from you.
>
> That makes sense to me, but I'm not sure whether or not that means it's
> queued. Do you say that a topic is queued once it's on your pu, or once
> you have written "Will merge to..."?
>
> Thanks in advance for your clarification.

Hmph, I guess I shouldn't use the verb "queue" if it implies a lot
more than there is to it.  I create a topic branch out of a patch
series on the list at some point in the iteration of a series and
merge it to 'pu'; I can say "I queued the topic to 'pu'" after doing
so.  The verb to me does not mean anything more than that.

The fact that a topic is queued on 'pu' does not mean much.  It can
be taken as a sign "Gitster thought that it may become 'next' worthy
material, either as-is or with further polishing and replacing."
Once a topic gets discussed on list and it seems apparent that there
is a concensus that supports it, I may mark the topic as "Will merge
to 'next'" in the What's cooking report, but I may not realize that
the list already reached such a concensus and may leave it unmarked
in the report.

So "this has been battle tested in such and such environment" and/or
"this round was reviwed by the thread here and they were supportive"
etc. is a very appreciated response to the "what's cooking" report
to help me merge the topic down to 'next'.

"I have sent a reroll at ..." I typically hear when I miss a
rerolled version and what is listed is still from an old iteration,
hence my "Eh, you are pointing at what I have queued" reaction.

Thanks.

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

* Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)
  2019-04-16 15:26   ` Junio C Hamano
@ 2019-04-17  7:18     ` Ævar Arnfjörð Bjarmason
  2019-04-18  0:12       ` Junio C Hamano
  0 siblings, 1 reply; 24+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2019-04-17  7:18 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git, Duy Nguyen, Phillip Wood, Derrick Stolee, Eric Wong


On Tue, Apr 16 2019, Junio C Hamano wrote:

> Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
>
>> On Tue, Apr 16 2019, Junio C Hamano wrote:
>>
>>
>>> * jc/gettext-test-fix (2019-04-15) 1 commit
>>>  - gettext tests: export the restored GIT_TEST_GETTEXT_POISON
>>>
>>>  The GETTEXT_POISON test option has been quite broken ever since it
>>>  was made runtime-tunable, which has been fixed.
>>>
>>>  Will merge to 'next'.
>>
>> LGTM, but AFAICT this patch of yours never got sent to the list,
>> oversight?
>
> I am reasonably sure that
> <xmqqlg0bvppc.fsf_-_@gitster-ct.c.googlers.com> was sent with you on
> CC: line.

My bad, missed it.

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

* Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)
  2019-04-16 14:51 ` Ævar Arnfjörð Bjarmason
  2019-04-16 15:26   ` Junio C Hamano
@ 2019-04-17  9:33   ` Duy Nguyen
  2019-04-17  9:52   ` Phillip Wood
  2 siblings, 0 replies; 24+ messages in thread
From: Duy Nguyen @ 2019-04-17  9:33 UTC (permalink / raw)
  To: Ævar Arnfjörð Bjarmason
  Cc: Junio C Hamano, Git Mailing List, Phillip Wood, Derrick Stolee,
	Eric Wong

On Tue, Apr 16, 2019 at 9:51 PM Ævar Arnfjörð Bjarmason
<avarab@gmail.com> wrote:
> > * nd/precious (2019-04-09) 1 commit
> >  - Introduce "precious" file concept
> >
> >  "git clean" learned to pay attention to the 'precious' attributes
> >  and keep untracked paths with the attribute instead of removing
> >  when the "--keep-precious" is given.
> >
> >  Will merge to 'next'.
>
> Duy had a message about this in
> https://public-inbox.org/git/CACsJy8AEZ-Lz6zgEsuNukvphB9TTa9FAC1gK05fhnie2xtfc9w@mail.gmail.com/
>
> If that was just a "I don't have time to deal with Ævar's deluge of
> comments" (sorry!) I'm happy to re-roll with the nits I had if anyone
> thinks those make sense (doc & test adjustments...).
>
> But that note is terse, not sure if it means "let's drop this no matter
> what" (for reasons...), ..., Duy?

I'm tired. You clearly think this is a bad idea. If it gets merge I'll
keep hearing about it. Just drop it and be done with it now.
-- 
Duy

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

* Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)
  2019-04-16 14:51 ` Ævar Arnfjörð Bjarmason
  2019-04-16 15:26   ` Junio C Hamano
  2019-04-17  9:33   ` Duy Nguyen
@ 2019-04-17  9:52   ` Phillip Wood
  2019-04-17 10:22     ` Ævar Arnfjörð Bjarmason
  2 siblings, 1 reply; 24+ messages in thread
From: Phillip Wood @ 2019-04-17  9:52 UTC (permalink / raw)
  To: Ævar Arnfjörð Bjarmason, Junio C Hamano
  Cc: git, Duy Nguyen, Phillip Wood, Derrick Stolee, Eric Wong

On 16/04/2019 15:51, Ævar Arnfjörð Bjarmason wrote:
> 
> On Tue, Apr 16 2019, Junio C Hamano wrote:
> 
>> * pw/rebase-i-internal-rfc (2019-03-21) 12 commits
>>   - rebase -i: run without forking rebase--interactive
>>   - rebase: use a common action enum
>>   - rebase -i: use struct rebase_options in do_interactive_rebase()
>>   - rebase -i: use struct rebase_options to parse args
>>   - rebase -i: use struct object_id for squash_onto
>>   - rebase -i: use struct commit when parsing options
>>   - rebase -i: remove duplication
>>   - rebase -i: combine rebase--interactive.c with rebase.c
>>   - rebase: use OPT_RERERE_AUTOUPDATE()
>>   - rebase: rename write_basic_state()
>>   - sequencer: always discard index after checkout
>>   - Merge branch 'ag/sequencer-reduce-rewriting-todo' into pw/rebase-i-internal-rfc
>>   (this branch uses ag/sequencer-reduce-rewriting-todo.)
>>
>>   The internal implementation of "git rebase -i" has been updated to
>>   avoid forking a separate "rebase--interactive" process.
>>
>>   Comments?  Is this ready?
> 
> I gave this some stress testing/review in your infra, works for me so
> far, and a good performance improvement.
> 
> My only problem with it is that the commit message doesn't note just
> quite how awesome it is, but I can live with that :)

Thanks for testing this, I'll send a re-roll that mentions the 
performance improvement. I'm still surprised by it, are you seeing an 
improvement in production as well as on the perf test you mentioned 
before? I wonder if some of the improvement is due to 
ag/sequencer-reduce-rewriting-todo if that wasn't in master when you ran 
the benchmarks but I haven't had time to investigate.

Best Wishes

Phillip

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

* Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)
  2019-04-17  9:52   ` Phillip Wood
@ 2019-04-17 10:22     ` Ævar Arnfjörð Bjarmason
  0 siblings, 0 replies; 24+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2019-04-17 10:22 UTC (permalink / raw)
  To: phillip.wood; +Cc: Junio C Hamano, git, Duy Nguyen, Derrick Stolee, Eric Wong


On Wed, Apr 17 2019, Phillip Wood wrote:

> On 16/04/2019 15:51, Ævar Arnfjörð Bjarmason wrote:
>>
>> On Tue, Apr 16 2019, Junio C Hamano wrote:
>>
>>> * pw/rebase-i-internal-rfc (2019-03-21) 12 commits
>>>   - rebase -i: run without forking rebase--interactive
>>>   - rebase: use a common action enum
>>>   - rebase -i: use struct rebase_options in do_interactive_rebase()
>>>   - rebase -i: use struct rebase_options to parse args
>>>   - rebase -i: use struct object_id for squash_onto
>>>   - rebase -i: use struct commit when parsing options
>>>   - rebase -i: remove duplication
>>>   - rebase -i: combine rebase--interactive.c with rebase.c
>>>   - rebase: use OPT_RERERE_AUTOUPDATE()
>>>   - rebase: rename write_basic_state()
>>>   - sequencer: always discard index after checkout
>>>   - Merge branch 'ag/sequencer-reduce-rewriting-todo' into pw/rebase-i-internal-rfc
>>>   (this branch uses ag/sequencer-reduce-rewriting-todo.)
>>>
>>>   The internal implementation of "git rebase -i" has been updated to
>>>   avoid forking a separate "rebase--interactive" process.
>>>
>>>   Comments?  Is this ready?
>>
>> I gave this some stress testing/review in your infra, works for me so
>> far, and a good performance improvement.
>>
>> My only problem with it is that the commit message doesn't note just
>> quite how awesome it is, but I can live with that :)
>
> Thanks for testing this, I'll send a re-roll that mentions the
> performance improvement. I'm still surprised by it, are you seeing an
> improvement in production as well as on the perf test you mentioned
> before? I wonder if some of the improvement is due to
> ag/sequencer-reduce-rewriting-todo if that wasn't in master when you
> ran the benchmarks but I haven't had time to investigate.

Just the perf tests. I don't think it'll have much noticeable impact on
a typical rebase, but everything helps...

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

* jc/format-patch-error-check, was Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)
  2019-04-16 13:19 What's cooking in git.git (Apr 2019, #03; Tue, 16) Junio C Hamano
                   ` (4 preceding siblings ...)
  2019-04-17  2:37 ` What's cooking in git.git (Apr 2019, #03; Tue, 16) Taylor Blau
@ 2019-04-17 12:50 ` Johannes Schindelin
  2019-04-18  0:48   ` Junio C Hamano
  2019-04-17 12:52 ` ab/test-lib-pass-trace2-env, " Johannes Schindelin
  2019-04-18  0:19 ` Denton Liu
  7 siblings, 1 reply; 24+ messages in thread
From: Johannes Schindelin @ 2019-04-17 12:50 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

Hi Junio,

On Tue, 16 Apr 2019, Junio C Hamano wrote:

> * jc/format-patch-error-check (2019-02-22) 2 commits
>   (merged to 'next' on 2019-04-10 at 6ca358b7ef)
>  + format-patch: notice failure to open cover letter for writing
>  + builtin/log: downcase the beginning of error messages
>  (this branch is used by jc/format-patch-noclobber.)
>
>  "git format-patch" used overwrite an existing patch/cover-letter
>  file.  A new "--no-clobber" option stops it.

Is it possible that this description needs to be adjusted, now that the
--no-clobber option patch is actually set to be discarded?

Ciao,
Dscho

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

* ab/test-lib-pass-trace2-env, was Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)
  2019-04-16 13:19 What's cooking in git.git (Apr 2019, #03; Tue, 16) Junio C Hamano
                   ` (5 preceding siblings ...)
  2019-04-17 12:50 ` jc/format-patch-error-check, was " Johannes Schindelin
@ 2019-04-17 12:52 ` Johannes Schindelin
  2019-04-18  0:19 ` Denton Liu
  7 siblings, 0 replies; 24+ messages in thread
From: Johannes Schindelin @ 2019-04-17 12:52 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

Hi Junio,

On Tue, 16 Apr 2019, Junio C Hamano wrote:

> * ab/test-lib-pass-trace2-env (2019-04-01) 1 commit
>   (merged to 'next' on 2019-04-16 at 4dad6d6d7a)
>  + test-lib: whitelist GIT_TR2_* in the environment
>
>  Allow tracing of Git executable while running out tests.

Did you mean "our" instead of "out"?

Ciao,
Dscho

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

* Re: jt/clone-server-option (was What's cooking in git.git (Apr 2019, #03; Tue, 16))
  2019-04-17  2:39   ` Junio C Hamano
@ 2019-04-17 16:18     ` Jonathan Tan
  2019-04-18  1:51       ` Junio C Hamano
  0 siblings, 1 reply; 24+ messages in thread
From: Jonathan Tan @ 2019-04-17 16:18 UTC (permalink / raw)
  To: gitster; +Cc: jonathantanmy, git

> Jonathan Tan <jonathantanmy@google.com> writes:
> 
> >> * jt/clone-server-option (2019-04-15) 4 commits
> >>  - SQUASH???
> >>  - clone: send server options when using protocol v2
> >>  - SQUASH???
> >>  - transport: die if server options are unsupported
> >> 
> >>  "git clone" learned a new --server-option option when talking over
> >>  the protocol version 2.
> >>
> >>  Getting there.
> >
> > With the two "SQUASH???" commits, I think that all outstanding comments
> > have been addressed, and Jonathan Nieder has given his Reviewed-by [1]
> > [2].
> 
> OK, so do you want me to do the squashing or are you sending the
> final version with jrnieder's reviewd-by's?  Either is fine, but
> I need to know to avoid waiting for an update that will not come.

Please do the squashing, if you don't mind.

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

* Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)
  2019-04-17  7:18     ` Ævar Arnfjörð Bjarmason
@ 2019-04-18  0:12       ` Junio C Hamano
  0 siblings, 0 replies; 24+ messages in thread
From: Junio C Hamano @ 2019-04-18  0:12 UTC (permalink / raw)
  To: Ævar Arnfjörð Bjarmason
  Cc: git, Duy Nguyen, Phillip Wood, Derrick Stolee, Eric Wong

Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:

>>> LGTM, but AFAICT this patch of yours never got sent to the list,
>>> oversight?
>>
>> I am reasonably sure that
>> <xmqqlg0bvppc.fsf_-_@gitster-ct.c.googlers.com> was sent with you on
>> CC: line.
>
> My bad, missed it.

While juggling several dozens of topics in flight, I'm bound to
screw up when it comes to work on and/or send out my own patch,
which only happens occasionally with the current workload.

Erring on the side of caution and helping me by pointing out a
potential mistake like you did was exactly what I would want to
see and appreciate.

Thanks.

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

* Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)
  2019-04-16 13:19 What's cooking in git.git (Apr 2019, #03; Tue, 16) Junio C Hamano
                   ` (6 preceding siblings ...)
  2019-04-17 12:52 ` ab/test-lib-pass-trace2-env, " Johannes Schindelin
@ 2019-04-18  0:19 ` Denton Liu
  7 siblings, 0 replies; 24+ messages in thread
From: Denton Liu @ 2019-04-18  0:19 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

Hi Junio,

On Tue, Apr 16, 2019 at 10:19:45PM +0900, Junio C Hamano wrote:
> * dl/rebase-i-keep-base (2019-04-16) 6 commits
>  - rebase: teach rebase --keep-base
>  - rebase: fast-forward --fork-point in more cases
>  - rebase: fast-forward --onto in more cases
>  - t3432: test rebase fast-forward behavior
>  - t3431: add rebase --fork-point tests
>  + tests (rebase): spell out the `--keep-empty` option
>  (this branch is tangled with js/spell-out-options-in-tests.)
> 
>  "git rebase --keep-base <upstream>" tries to find the original base
>  of the topic being rebased and rebase on top of that same base, which
>  is useful when running the "git rebase -i" (and its limited variant
>  "git rebase -x").
> 
>  Will merge to 'next'.

Since this patchset has grown in scope, could we update the description
to mention that rebase now fast-forwards in more cases? I think this
would be useful information for users to know when we write the release
notes.

Thanks,

Denton

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

* Re: jc/format-patch-error-check, was Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)
  2019-04-17 12:50 ` jc/format-patch-error-check, was " Johannes Schindelin
@ 2019-04-18  0:48   ` Junio C Hamano
  0 siblings, 0 replies; 24+ messages in thread
From: Junio C Hamano @ 2019-04-18  0:48 UTC (permalink / raw)
  To: Johannes Schindelin; +Cc: git

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

> Hi Junio,
>
> On Tue, 16 Apr 2019, Junio C Hamano wrote:
>
>> * jc/format-patch-error-check (2019-02-22) 2 commits
>>   (merged to 'next' on 2019-04-10 at 6ca358b7ef)
>>  + format-patch: notice failure to open cover letter for writing
>>  + builtin/log: downcase the beginning of error messages
>>  (this branch is used by jc/format-patch-noclobber.)
>>
>>  "git format-patch" used overwrite an existing patch/cover-letter
>>  file.  A new "--no-clobber" option stops it.
>
> Is it possible that this description needs to be adjusted, now that the
> --no-clobber option patch is actually set to be discarded?
>
> Ciao,
> Dscho

Sharp eyes.  Thanks.

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

* Re: jt/clone-server-option (was What's cooking in git.git (Apr 2019, #03; Tue, 16))
  2019-04-17 16:18     ` Jonathan Tan
@ 2019-04-18  1:51       ` Junio C Hamano
  0 siblings, 0 replies; 24+ messages in thread
From: Junio C Hamano @ 2019-04-18  1:51 UTC (permalink / raw)
  To: Jonathan Tan; +Cc: git

Jonathan Tan <jonathantanmy@google.com> writes:

>> Jonathan Tan <jonathantanmy@google.com> writes:
>> 
>> >> * jt/clone-server-option (2019-04-15) 4 commits
>> >>  - SQUASH???
>> >>  - clone: send server options when using protocol v2
>> >>  - SQUASH???
>> >>  - transport: die if server options are unsupported
>> >> 
>> >>  "git clone" learned a new --server-option option when talking over
>> >>  the protocol version 2.
>> >>
>> >>  Getting there.
>> >
>> > With the two "SQUASH???" commits, I think that all outstanding comments
>> > have been addressed, and Jonathan Nieder has given his Reviewed-by [1]
>> > [2].
>> 
>> OK, so do you want me to do the squashing or are you sending the
>> final version with jrnieder's reviewd-by's?  Either is fine, but
>> I need to know to avoid waiting for an update that will not come.
>
> Please do the squashing, if you don't mind.

Will do; thanks.

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

* Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)
  2019-04-17  6:14       ` Junio C Hamano
@ 2019-04-18  6:54         ` Taylor Blau
  0 siblings, 0 replies; 24+ messages in thread
From: Taylor Blau @ 2019-04-18  6:54 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: Taylor Blau, git

On Wed, Apr 17, 2019 at 03:14:28PM +0900, Junio C Hamano wrote:
> Taylor Blau <me@ttaylorr.com> writes:
>
> >> That's this one
> >>
> >>     Date: Tue, 9 Apr 2019 19:13:06 -0700 (1 week, 3 hours, 23 minutes ago)
> >>     Subject: [PATCH v2 0/7] harden unexpected object types checks
> >>
> >> which I think is what has been queued and what is listed in the
> >> message you are responding to.
> >
> > Ah, perhaps you could clarify some confusion I have about the "What's
> > Cooking" emails (or at least point me somewhere I could un-confuse
> > myself).
> >
> > This topic is in the "Cooking" section with a "-" (which I recall means
> > that it's in 'pu'), but there is no "Will merge to ..." line below it
> > from you.
> >
> > That makes sense to me, but I'm not sure whether or not that means it's
> > queued. Do you say that a topic is queued once it's on your pu, or once
> > you have written "Will merge to..."?
> >
> > Thanks in advance for your clarification.
>
> Hmph, I guess I shouldn't use the verb "queue" if it implies a lot
> more than there is to it.  I create a topic branch out of a patch
> series on the list at some point in the iteration of a series and
> merge it to 'pu'; I can say "I queued the topic to 'pu'" after doing
> so.  The verb to me does not mean anything more than that.

I thought that there was much more to it than it seems there actually
is. Thank you for clarifying what is meant here.

> The fact that a topic is queued on 'pu' does not mean much.  It can
> be taken as a sign "Gitster thought that it may become 'next' worthy
> material, either as-is or with further polishing and replacing."

This matches my understanding that 'pu' is a precursor for 'next' and so
on.

> Once a topic gets discussed on list and it seems apparent that there
> is a concensus that supports it, I may mark the topic as "Will merge
> to 'next'" in the What's cooking report, but I may not realize that
> the list already reached such a concensus and may leave it unmarked
> in the report.
>
> So "this has been battle tested in such and such environment" and/or
> "this round was reviwed by the thread here and they were supportive"
> etc. is a very appreciated response to the "what's cooking" report
> to help me merge the topic down to 'next'.

That's quite helpful to know in the future.

For this topic in particular, we've been running a nearly-identical
version of it at GitHub for a couple of weeks now. It went out smoothly,
and hasn't caused any trouble since. (In fact, quite the opposite: it
fixed the bug that caused me to look into this in the first place. That
is, the repository that SIGSEV'd after a `git rev-list --all --objects`
no longer does).

So, for clarity I think that this can be considered "battle-tested" and
ready to merge onto next.

> "I have sent a reroll at ..." I typically hear when I miss a
> rerolled version and what is listed is still from an old iteration,
> hence my "Eh, you are pointing at what I have queued" reaction.

Understood, and thank you again :-).

> Thanks.

Thanks,
Taylor

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

end of thread, other threads:[~2019-04-18  6:54 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-16 13:19 What's cooking in git.git (Apr 2019, #03; Tue, 16) Junio C Hamano
2019-04-16 14:51 ` Ævar Arnfjörð Bjarmason
2019-04-16 15:26   ` Junio C Hamano
2019-04-17  7:18     ` Ævar Arnfjörð Bjarmason
2019-04-18  0:12       ` Junio C Hamano
2019-04-17  9:33   ` Duy Nguyen
2019-04-17  9:52   ` Phillip Wood
2019-04-17 10:22     ` Ævar Arnfjörð Bjarmason
2019-04-16 15:27 ` Ben Peart
2019-04-17  2:37   ` Junio C Hamano
2019-04-16 16:25 ` Stalled ds/ branches (was What's cooking in git.git (Apr 2019, #03; Tue, 16)) Derrick Stolee
2019-04-16 17:32 ` jt/clone-server-option " Jonathan Tan
2019-04-17  2:39   ` Junio C Hamano
2019-04-17 16:18     ` Jonathan Tan
2019-04-18  1:51       ` Junio C Hamano
2019-04-17  2:37 ` What's cooking in git.git (Apr 2019, #03; Tue, 16) Taylor Blau
2019-04-17  5:38   ` Junio C Hamano
2019-04-17  5:42     ` Taylor Blau
2019-04-17  6:14       ` Junio C Hamano
2019-04-18  6:54         ` Taylor Blau
2019-04-17 12:50 ` jc/format-patch-error-check, was " Johannes Schindelin
2019-04-18  0:48   ` Junio C Hamano
2019-04-17 12:52 ` ab/test-lib-pass-trace2-env, " Johannes Schindelin
2019-04-18  0:19 ` Denton Liu

Code repositories for project(s) associated with this public inbox

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).