To: git@vger.kernel.org
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (Apr 2019, #01; Thu, 4)
-X-master-at: 041f5ea1cf987a4068ef5f39ba0a09be85952064
-X-next-at: f8f6787159eebeb0fe8766e114123185ee1893ea
+Subject: What's cooking in git.git (Apr 2019, #02; Wed, 10)
+X-master-at: e35b8cb8e212e3557efc565157ceb5cbaaf0d87f
+X-next-at: 511ec345e18b91bfc070cff61e34b433cb3e5a41
-What's cooking in git.git (Apr 2019, #01; Thu, 4)
+What's cooking in git.git (Apr 2019, #02; Wed, 10)
--------------------------------------------------
Here are the topics that have been cooking. 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.
+Sorry for keeping a rather huge backlog for the past few weeks. As
+the result, tonight's pushout is a rather large one, merging 30+
+topics to 'next' and a dozen or so to 'master'.
+
You can find the changes described here in the integration branches
of the repositories listed at
--------------------------------------------------
[Graduated to "master"]
-* ab/makefile-help-devs-more (2019-02-24) 6 commits
- (merged to 'next' on 2019-03-11 at 898f5f44bc)
- + Makefile: allow for combining DEVELOPER=1 and CFLAGS="..."
- + Makefile: move the setting of *FLAGS closer to "include"
- + Makefile: Move *_LIBS assignment into its own section
- + Makefile: add/remove comments at top and tweak whitespace
- + Makefile: move "strip" assignment down from flags
- + Makefile: remove an out-of-date comment
+* ar/t4150-remove-cruft (2019-03-13) 1 commit
+ (merged to 'next' on 2019-03-20 at a0106a8d5c)
+ + t4150: remove unused variable
- Originally merged to 'next' on 2019-03-07
+ Test cleanup.
- CFLAGS now can be tweaked when invoking Make while using
- DEVELOPER=YesPlease; this did not work well before.
+* dl/ignore-docs (2019-03-08) 2 commits
+ (merged to 'next' on 2019-03-20 at f1f50c07ef)
+ + docs: move core.excludesFile from git-add to gitignore
+ + git-clean.txt: clarify ignore pattern files
-* br/commit-tree-parseopt (2019-03-08) 1 commit
- (merged to 'next' on 2019-03-11 at e1228ef04f)
- + commit-tree: utilize parse-options api
+ Doc update.
- Originally merged to 'next' on 2019-03-08
- The command line parser of "git commit-tree" has been rewritten to
- use the parse-options API.
+* dl/reset-doc-no-wrt-abbrev (2019-03-06) 1 commit
+ (merged to 'next' on 2019-03-20 at 984b4586c7)
+ + git-reset.txt: clarify documentation
+ Doc update.
-* jk/bisect-final-output (2019-03-01) 3 commits
- (merged to 'next' on 2019-03-11 at dea599eb04)
- + bisect: make diff-tree output prettier
- + bisect: fix internal diff-tree config loading
- + bisect: use string arguments to feed internal diff-tree
- Originally merged to 'next' on 2019-03-07
+* ja/dir-rename-doc-markup-fix (2019-03-06) 1 commit
+ (merged to 'next' on 2019-03-20 at f3238df381)
+ + Doc: fix misleading asciidoc formating
- The final report from "git bisect" used to show the suspected
- culprit using a raw "diff-tree", with which there is no output for
- a merge commit. This has been updated to use a more modern and
- human readable output that still is concise enough.
+ Doc update.
-* jk/config-type-color-ends-with-lf (2019-03-07) 1 commit
- (merged to 'next' on 2019-03-11 at 810b269d1a)
- + config: document --type=color output is a complete line
+* jh/resize-convert-scratch-buffer (2019-03-08) 1 commit
+ (merged to 'next' on 2019-03-20 at 92a24b29ed)
+ + convert: avoid malloc of original file size
- Originally merged to 'next' on 2019-03-07
+ When the "clean" filter can reduce the size of a huge file in the
+ working tree down to a small "token" (a la Git LFS), there is no
+ point in allocating a huge scratch area upfront, but the buffer is
+ sized based on the original file size. The convert mechanism now
+ allocates very minimum and reallocates as it receives the output
+ from the clean filter process.
- "git config --type=color ..." is meant to replace "git config --get-color"
- but there is a slight difference that wasn't documented, which is
- now fixed.
+* jk/line-log-with-patch (2019-03-11) 2 commits
+ (merged to 'next' on 2019-03-20 at 21afea908c)
+ + line-log: detect unsupported formats
+ + line-log: suppress diff output with "-s"
-* jk/fsck-doc (2019-03-05) 2 commits
- (merged to 'next' on 2019-03-11 at 5cd610f73e)
- + fsck: always compute USED flags for unreachable objects
- + doc/fsck: clarify --connectivity-only behavior
+ "git log -L<from>,<to>:<path>" with "-s" did not suppress the patch
+ output as it should. This has been corrected.
- Originally merged to 'next' on 2019-03-07
- "git fsck --connectivity-only" omits computation necessary to sift
- the objects that are not reachable from any of the refs into
- unreachable and dangling. This is now enabled when dangling
- objects are requested (which is done by default, but can be
- overridden with the "--no-dangling" option).
+* jk/promote-ggg (2019-03-13) 1 commit
+ (merged to 'next' on 2019-03-20 at 3db7d2566d)
+ + point pull requesters to GitGitGadget
+ Suggest GitGitGadget instead of submitGit as a way to submit
+ patches based on GitHub PR to us.
-* jk/no-sigpipe-during-network-transport (2019-03-05) 2 commits
- (merged to 'next' on 2019-03-11 at 25900acd0d)
- + fetch: ignore SIGPIPE during network operation
- + fetch: avoid calling write_or_die()
- Originally merged to 'next' on 2019-03-07
+* jk/sha1dc (2019-03-13) 1 commit
+ (merged to 'next' on 2019-03-20 at 969280e8e5)
+ + Makefile: fix unaligned loads in sha1dc with UBSan
- On platforms where "git fetch" is killed with SIGPIPE (e.g. OSX),
- the upload-pack that runs on the other end that hangs up after
- detecting an error could cause "git fetch" to die with a signal,
- which led to a flakey test. "git fetch" now ignores SIGPIPE during
- the network portion of its operation (this is not a problem as we
- check the return status from our write(2)s).
+ Build update for SHA-1 with collision detection.
-* jk/virtual-objects-do-exist (2019-03-05) 1 commit
- (merged to 'next' on 2019-03-11 at 748c79a1f0)
- + rev-list: allow cached objects in existence check
+* js/rebase-deprecate-preserve-merges (2019-03-12) 1 commit
+ (merged to 'next' on 2019-03-20 at 32baac3acd)
+ + rebase: deprecate --preserve-merges
- Originally merged to 'next' on 2019-03-07
+ "git rebase --rebase-merges" replaces its old "--preserve-merges"
+ option; the latter is now marked as deprecated.
- A recent update broke "is this object available to us?" check for
- well-known objects like an empty tree (which should yield "yes",
- even when there is no on-disk object for an empty tree), which has
- been corrected.
+* jt/submodule-fetch-errmsg (2019-03-14) 1 commit
+ (merged to 'next' on 2019-03-20 at a6b0efa76f)
+ + submodule: explain first attempt failure clearly
-* js/rebase-orig-head-fix (2019-03-04) 4 commits
- (merged to 'next' on 2019-03-11 at 4b1b19d391)
- + built-in rebase: set ORIG_HEAD just once, before the rebase
- + built-in rebase: demonstrate that ORIG_HEAD is not set correctly
- + built-in rebase: use the correct reflog when switching branches
- + built-in rebase: no need to check out `onto` twice
+ Error message update.
+ cf. <20190313175738.252961-1-jonathantanmy@google.com> (v2)
- Originally merged to 'next' on 2019-03-07
- "git rebase" that was reimplemented in C did not set ORIG_HEAD
- correctly, which has been corrected.
+* ms/worktree-add-atomic-mkdir (2019-03-12) 1 commit
+ (merged to 'next' on 2019-03-20 at ded442ed02)
+ + worktree: fix worktree add race
+ "git worktree add" used to do a "find an available name with stat
+ and then mkdir", which is race-prone. This has been fixed by using
+ mkdir and reacting to EEXIST in a loop.
-* js/stress-test-ui-tweak (2019-03-04) 2 commits
- (merged to 'next' on 2019-03-11 at 223afded1c)
- + tests: introduce --stress-jobs=<N>
- + tests: let --stress-limit=<N> imply --stress
- Originally merged to 'next' on 2019-03-07
+* nd/rewritten-ref-is-per-worktree (2019-03-08) 3 commits
+ (merged to 'next' on 2019-03-20 at 5369a2e1f6)
+ + Make sure refs/rewritten/ is per-worktree
+ + files-backend.c: reduce duplication in add_per_worktree_entries_to_dir()
+ + files-backend.c: factor out per-worktree code in loose_fill_ref_dir()
- Dev support.
+ "git rebase" uses the refs/rewritten/ hierarchy to store its
+ intermediate states, which inherently makes the hierarchy per
+ worktree, but it didn't quite work well.
-* ma/clear-repository-format (2019-03-01) 2 commits
- (merged to 'next' on 2019-03-11 at f3db1c278f)
- + setup: fix memory leaks with `struct repository_format`
- + setup: free old value before setting `work_tree`
+* ra/t3600-test-path-funcs (2019-03-08) 3 commits
+ (merged to 'next' on 2019-03-20 at 404110d291)
+ + t3600: use helpers to replace test -d/f/e/s <path>
+ + t3600: modernize style
+ + test functions: add function `test_file_not_empty`
- Originally merged to 'next' on 2019-03-07
+ A GSoC micro.
+ cf. <20190304120801.28763-1-rohit.ashiwal265@gmail.com> (v3)
+
+--------------------------------------------------
+[New Topics]
+
+* 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
+ - 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 'next'.
+
+
+* dl/flex-str-cocci (2019-04-04) 2 commits
+ - cocci: FLEX_ALLOC_MEM to FLEX_ALLOC_STR
+ - midx.c: convert FLEX_ALLOC_MEM to FLEX_ALLOC_STR
+
+ Code clean-up.
+
+ Will merge to 'next'.
+
+
+* dl/warn-tagging-a-tag (2019-04-09) 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
+ - revision: use a prio_queue to hold rewritten parents
+
+ Performance fix for "rev-list --parents -- pathspec".
+
+ Will merge to 'next'.
+
+
+* tb/unexpected (2019-04-05) 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.
+
+ Waiting for a reroll.
+ cf. <20190406053308.GC37216@Taylors-MBP.hsd1.wa.comcast.net>
+
+
+* 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-08) 14 commits
+ - 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
+ - SQUASH???
+ - 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 'next' after squashing the SQUASH?? in.
+
+
+* 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-09) 1 commit
+ - clone: send server options when using protocol v2
+
+ "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-08) 1 commit
+ - Documentation/git-show-branch: drop last use of {apostrophe}
+
+ Doc formatting fix.
+
+ Will merge to 'next'.
+
+
+* tz/git-svn-doc-markup-fix (2019-04-08) 1 commit
+ - Documentation/git-svn: improve asciidoctor compatibility
+
+ Doc formatting fix.
+
+ Needs a better description.
+ cf. <CAN0heSpL_pQMtDaEdDgcsC_Sso45owHjRttrdp7cQdYOb7i9BA@mail.gmail.com>
+
+
+* js/t3301-unbreak-notes-test (2019-04-09) 1 commit
+ - t3301: fix false negative
+
+ Test fix.
+
+ Will merge to 'next'.
- The setup code has been cleaned up to avoid leaks around the
- repository_format structure.
+* ss/msvc-path-utils-fix (2019-04-09) 1 commit
+ - MSVC: include compat/win32/path-utils.h for MSVC, too, for real_path()
-* sx/evolve (2019-02-15) 8 commits
- . evolve: add the git change list command
- . evolve: implement the git change command
- . evolve: add support for writing metacommits
- . evolve: add the change-table structure
- . evolve: add support for parsing metacommits
- . ref-filter: add the metas namespace to ref-filter
- . sha1-array: implement oid_array_readonly_contains
- . technical doc: add a design doc for the evolve command
+ An earlier update for MinGW and Cygwin accidentally broke MSVC build,
+ which has been fixed.
- The beginning of "hg evolve" mimicry.
+ May want to clarify the log message?
+ cf. <af640e82-ca1a-9c96-da47-62aaea1cc18e@web.de>
--------------------------------------------------
-[New Topics]
+[Stalled]
-* ms/worktree-add-atomic-mkdir (2019-03-12) 1 commit
- (merged to 'next' on 2019-03-20 at ded442ed02)
- + worktree: fix worktree add race
+* 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 worktree add" used to do a "find an available name with stat
- and then mkdir", which is race-prone. This has been fixed by using
- mkdir and reacting to EEXIST in a loop.
+ "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.
- Will merge to 'master'.
+ 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]
* tb/stash-in-c-unused-param-fix (2019-03-11) 1 commit
(merged to 'next' on 2019-03-20 at 5ccac5f80d)
* dl/subtree-limit-to-one-rev (2019-03-12) 1 commit
- - contrib/subtree: ensure only one rev is provided
+ (merged to 'next' on 2019-04-10 at 8631f869c5)
+ + contrib/subtree: ensure only one rev is provided
"git subtree" (in contrib/) update.
- Will merge to 'next'.
-
-
-* ar/t4150-remove-cruft (2019-03-13) 1 commit
- (merged to 'next' on 2019-03-20 at a0106a8d5c)
- + t4150: remove unused variable
-
- Test cleanup.
-
Will merge to 'master'.
Will merge to 'next'.
-* cc/multi-promisor (2019-04-02) 11 commits
+* cc/multi-promisor (2019-04-08) 13 commits
+ - SQUASH??? do not include fetch-objects.h
+ - SQUASH??? r->name[] is a flexarray that cannot be NULL
- 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
- Add initial support for many promisor remotes
- fetch-object: make functions return an error code
- Breaks 'pu'.
-
-
-* jk/promote-ggg (2019-03-13) 1 commit
- (merged to 'next' on 2019-03-20 at 3db7d2566d)
- + point pull requesters to GitGitGadget
-
- Suggest GitGitGadget instead of submitGit as a way to submit
- patches based on GitHub PR to us.
-
- Will merge to 'master'.
-
-
-* jk/sha1dc (2019-03-13) 1 commit
- (merged to 'next' on 2019-03-20 at 969280e8e5)
- + Makefile: fix unaligned loads in sha1dc with UBSan
-
- Build update for SHA-1 with collision detection.
-
- Will merge to 'master'.
-
-
-* jt/submodule-fetch-errmsg (2019-03-14) 1 commit
- (merged to 'next' on 2019-03-20 at a6b0efa76f)
- + submodule: explain first attempt failure clearly
-
- Error message update.
+ Expecting a reroll.
- Will merge to 'master'.
- cf. <20190313175738.252961-1-jonathantanmy@google.com> (v2)
+ An earlier breakage on 'pu' due to incorrect semantic conflict
+ resolution has been corrected.
* nd/switch-and-restore (2019-04-02) 39 commits
* ab/doc-misc-typofixes (2019-03-18) 1 commit
- - doc: fix typos in man pages
+ (merged to 'next' on 2019-04-10 at 06d19acd7e)
+ + doc: fix typos in man pages
Typofixes.
- Will merge to 'next'.
+ Will merge to 'master'.
* ab/drop-scripted-rebase (2019-03-20) 1 commit
- - rebase: remove the rebase.useBuiltin setting
+ (merged to 'next' on 2019-04-10 at ff8abf36ae)
+ + rebase: remove the rebase.useBuiltin setting
Retire scripted "git rebase" implementation.
- Will merge to 'next'.
+ Will merge to 'master'.
* ab/gc-reflog (2019-04-01) 7 commits
Fix various glitches in "git gc" around reflog handling.
- cf. <20190328161434.19200-1-avarab@gmail.com> (v4)
+ Will merge to 'next'.
* ew/repack-with-bitmaps-by-default (2019-03-18) 3 commits
* jk/perf-lib-tee (2019-03-18) 1 commit
- - perf-lib.sh: rely on test-lib.sh for --tee handling
+ (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.
- Will merge to 'next'.
+ Will merge to 'master'.
* js/check-docs-exe (2019-04-01) 5 commits
* js/get-short-oid-drop-cache (2019-03-14) 4 commits
- - 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
+ (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 (half) fixed.
- Will merge to 'next'.
+ Will merge to 'master'.
* ma/doc-diff-doc-vs-doctor-comparison (2019-03-18) 4 commits
- - 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
+ (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.
- Will merge to 'next'.
+ Will merge to 'master'.
cf. <20190319031412.GC6173@sigill.intra.peff.net>
* mh/pack-protocol-doc-fix (2019-03-18) 1 commit
- - fix pack protocol example client/server communication
+ (merged to 'next' on 2019-04-10 at 037673d71c)
+ + fix pack protocol example client/server communication
Docfix.
- Will merge to 'next'.
+ Will merge to 'master'.
* nd/checkout-f-while-conflicted-fix (2019-03-21) 1 commit
- - unpack-trees: fix oneway_merge accidentally carry over stage index
+ (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.
- Will merge to 'next'.
+ Will merge to 'master'.
* pw/cherry-pick-continue (2019-03-18) 3 commits
* pw/rerere-autoupdate (2019-03-18) 2 commits
- - merge: tweak --rerere-autoupdate documentation
- - am/cherry-pick/rebase/revert: document --rerere-autoupdate
+ (merged to 'next' on 2019-04-10 at cf79e86682)
+ + merge: tweak --rerere-autoupdate documentation
+ + am/cherry-pick/rebase/revert: document --rerere-autoupdate
Doc updates.
- Will merge to 'next'.
+ Will merge to 'master'.
* sg/test-atexit (2019-03-14) 11 commits
- - 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'
+ (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 'next'.
+ Will merge to 'master'.
* tb/trace2-va-list-fix (2019-03-20) 1 commit
- - trace2: NULL is not allowed for va_list
+ (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.
- Will merge to 'next'.
+ Will merge to 'master'.
* tg/glossary-overlay (2019-03-18) 1 commit
- - glossary: add definition for overlay
+ (merged to 'next' on 2019-04-10 at f5415c65cc)
+ + glossary: add definition for overlay
Doc update.
- Will merge to 'next'.
+ Will merge to 'master'.
* tg/stash-in-c-show-default-to-p-fix (2019-03-21) 1 commit
- - stash: setup default diff output format if necessary
+ (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 'next'.
+ Will merge to 'master'.
* tz/completion (2019-03-21) 4 commits
- - 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
+ (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.
- Will merge to 'next'.
+ Will merge to 'master'.
cf. <20190320180329.22280-1-tmz@pobox.com> (v3)
* tz/t4038-bash-redirect-target-workaround (2019-03-18) 1 commit
- - t4038-diff-combined: quote paths with whitespace
+ (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.
- Will merge to 'next'.
+ Will merge to 'master'.
* jc/format-patch-noclobber (2019-02-22) 1 commit
(this branch uses jc/format-patch-error-check.)
-
* jk/unused-params-even-more (2019-03-21) 13 commits
- - 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
+ (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
- Will merge to 'next'.
+ Code cleanup.
+
+ Will merge to 'master'.
* ab/commit-graph-fixes (2019-04-01) 8 commits
Will merge to 'next'.
-* ab/gc-docs (2019-04-01) 12 commits
- - SQAUSH??? fixup! gc docs: include the "gc.*" section from "config" in "gc"
+* 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: 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
"git p4" update.
+ Is this ready for 'next'?
+
* bb/unicode-12 (2019-03-22) 1 commit
- - unicode: update the width tables to Unicode 12
+ (merged to 'next' on 2019-04-10 at b0dfa1001e)
+ + unicode: update the width tables to Unicode 12
Unicode update.
- Will merge to 'next'.
+ Will merge to 'master'.
* bc/hash-transition-16 (2019-04-01) 35 commits
Will merge to 'next'.
-
* cc/replace-graft-peel-tags (2019-04-01) 4 commits
- replace: fix --graft when passing a tag first
- replace: fix --graft when passing a tag as parent
Will merge to 'next'.
-* dl/forbid-tagging-a-tag (2019-04-03) 3 commits
- - SQUASH???
- - tag: prevent nested tags
- - tag: fix formatting
-
- "git tag $newtag $obj", when $obj is another tag, now aborts,
- requiring a new --allow-nested-tag option, even though an
- invocation with $obj that is a blob or a tree is silently allowed,
- which does not make much sense.
-
- Will discard.
-
-
-* dl/rebase-i-keep-base (2019-04-03) 4 commits
+* dl/rebase-i-keep-base (2019-04-08) 5 commits
- rebase: teach rebase --keep-base
- 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
* jh/midx-verify-too-many-packs (2019-03-22) 4 commits
- - 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
+ (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.
- Will merge to 'next'.
+ Will merge to 'master'.
* jh/trace2-sid-fix (2019-04-01) 7 commits
* jk/http-walker-status-fix (2019-03-24) 3 commits
- - 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
+ (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.
- Will merge to 'next'.
+ Will merge to 'master'.
* jk/refs-double-abort (2019-03-22) 2 commits
- - refs/files-backend: don't look at an aborted transaction
- - refs/files-backend: handle packed transaction prepare failure
+ (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.
- Will merge to 'next'.
+ Will merge to 'master'.
* js/spell-out-options-in-tests (2019-04-02) 8 commits
- 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
The trace2 tracing facility learned to auto-generate a filename
when told to log to a directory.
- Will merge to 'next'.
+ Ready for 'next'; giving the last chance to be intercepted.
+ cf. <20190408211850.GJ60888@google.com>
-* jt/batch-fetch-blobs-in-diff (2019-04-01) 2 commits
+* jt/batch-fetch-blobs-in-diff (2019-04-08) 2 commits
- diff: batch fetching of missing blobs
- sha1-file: support OBJECT_INFO_FOR_PREFETCH
* jt/t5551-protocol-v2-does-not-have-half-auth (2019-03-24) 1 commit
- - t5551: mark half-auth no-op fetch test as v0-only
+ (merged to 'next' on 2019-04-10 at 86ca3ebf33)
+ + t5551: mark half-auth no-op fetch test as v0-only
Test update.
- Will merge to 'next'.
-
+ Will merge to 'master'.
* km/empty-repo-is-still-a-repo (2019-04-03) 4 commits
repository, which is not what the user wants. These problems are
being addressed.
- Getting there.
+ Expecting a reroll.
cf. <87bm1mbua4.fsf@kyleam.com>
* nd/checkout-m-doc-update (2019-03-21) 1 commit
- - checkout.txt: note about losing staged changes with --merge
+ (merged to 'next' on 2019-04-10 at cdda4e833e)
+ + checkout.txt: note about losing staged changes with --merge
Doc about the above.
- Will merge to 'next'.
+ Will merge to 'master'.
* nd/commit-a-with-paths-msg-update (2019-03-22) 1 commit
* nd/diff-parseopt-4 (2019-03-24) 20 commits
- - 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
+ (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
(this branch uses nd/diff-parseopt-3.)
Fourth batch to teach the diff machinery to use the parse-options
API.
- Will merge to 'next'.
+ Will merge to 'master'.
* nd/include-if-wildmatch (2019-04-01) 1 commit
Will merge to 'next'.
-
-* nd/precious (2019-04-01) 1 commit
+* 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.
+ and keep untracked paths with the attribute instead of removing
+ when the "--keep-precious" is given.
Will merge to 'next'.
Will merge to 'next'.
-* nd/sha1-name-c-wo-the-repository (2019-04-02) 31 commits
+* nd/sha1-name-c-wo-the-repository (2019-04-08) 33 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
- 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
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-01) 6 commits
+
+* sg/asciidoctor-in-ci (2019-04-05) 6 commits
- 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'
* sg/index-pack-progress (2019-04-01) 1 commit
- index-pack: show progress while checking objects
- size_t???
+ A progress indicator has been added to the "index-pack" step, which
+ often makes users wait for completion during "git clone".
+
+ Will merge to 'next'.
-* sg/overlong-progress-fix (2019-04-02) 4 commits
+* sg/overlong-progress-fix (2019-04-05) 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
* sg/t5318-cleanup (2019-03-24) 1 commit
- - t5318-commit-graph: remove unused variable
+ (merged to 'next' on 2019-04-10 at 787b1b5073)
+ + t5318-commit-graph: remove unused variable
Code cleanup.
- Will merge to 'next'.
+ Will merge to 'master'.
* tz/asciidoctor-fixes (2019-04-01) 2 commits
Will merge to 'next'.
---------------------------------------------------
-[Stalled]
-
-* 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]
-
-* 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>
-
-
-* dl/ignore-docs (2019-03-08) 2 commits
- (merged to 'next' on 2019-03-20 at f1f50c07ef)
- + docs: move core.excludesFile from git-add to gitignore
- + git-clean.txt: clarify ignore pattern files
-
- Doc update.
-
- Will merge to 'master'.
-
-
-* jh/resize-convert-scratch-buffer (2019-03-08) 1 commit
- (merged to 'next' on 2019-03-20 at 92a24b29ed)
- + convert: avoid malloc of original file size
-
- When the "clean" filter can reduce the size of a huge file in the
- working tree down to a small "token" (a la Git LFS), there is no
- point in allocating a huge scratch area upfront, but the buffer is
- sized based on the original file size. The convert mechanism now
- allocates very minimum and reallocates as it receives the output
- from the clean filter process.
-
- Will merge to 'master'.
-
-
-* jk/line-log-with-patch (2019-03-11) 2 commits
- (merged to 'next' on 2019-03-20 at 21afea908c)
- + line-log: detect unsupported formats
- + line-log: suppress diff output with "-s"
-
- "git log -L<from>,<to>:<path>" with "-s" did not suppress the patch
- output as it should. This has been corrected.
-
- Will merge to 'master'.
-
-
-* js/rebase-deprecate-preserve-merges (2019-03-12) 1 commit
- (merged to 'next' on 2019-03-20 at 32baac3acd)
- + rebase: deprecate --preserve-merges
-
- "git rebase --rebase-merges" replaces its old "--preserve-merges"
- option; the latter is now marked as deprecated.
-
- Will merge to 'master'.
-
* js/init-db-update-for-mingw (2019-03-12) 1 commit
- - mingw: respect core.hidedotfiles = false in git-init again
+ (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.
- Will merge to 'next'.
+ Will merge to 'master'.
* js/stash-in-c-pathspec-fix (2019-03-12) 3 commits
Will cook in 'next'.
-* nd/rewritten-ref-is-per-worktree (2019-03-08) 3 commits
- (merged to 'next' on 2019-03-20 at 5369a2e1f6)
- + Make sure refs/rewritten/ is per-worktree
- + files-backend.c: reduce duplication in add_per_worktree_entries_to_dir()
- + files-backend.c: factor out per-worktree code in loose_fill_ref_dir()
-
- "git rebase" uses the refs/rewritten/ hierarchy to store its
- intermediate states, which inherently makes the hierarchy per
- worktree, but it didn't quite work well.
-
- Will merge to 'master'.
-
-
* js/remote-curl-i18n (2019-03-06) 1 commit
- - remote-curl: mark all error messages for translation
+ (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.
- Will merge to 'next'.
+ Will merge to 'master'.
* ma/asciidoctor-fixes-more (2019-03-07) 5 commits
- - 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
+ (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.
- Will merge to 'next'.
+ Will merge to 'master'.
* nd/diff-parseopt-3 (2019-03-07) 20 commits
* js/anonymize-remote-curl-diag (2019-03-05) 1 commit
- - curl: anonymize URLs in error messages and warnings
+ (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.
- Will merge to 'next'.
+ Will merge to 'master'.
* ma/asciidoctor-fixes (2019-03-11) 3 commits
- - asciidoctor-extensions: fix spurious space after linkgit
- - Documentation/Makefile: add missing dependency on asciidoctor-extensions
- - Documentation/Makefile: add missing xsl dependencies for manpages
+ (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
- Will merge to 'next'.
+ Will merge to 'master'.
* nd/worktree-name-sanitization (2019-03-20) 2 commits
given to worktrees, to make sure these refs are well-formed.
-* ra/t3600-test-path-funcs (2019-03-08) 3 commits
- (merged to 'next' on 2019-03-20 at 404110d291)
- + t3600: use helpers to replace test -d/f/e/s <path>
- + t3600: modernize style
- + test functions: add function `test_file_not_empty`
-
- A GSoC micro.
-
- Will merge to 'master'.
- cf. <20190304120801.28763-1-rohit.ashiwal265@gmail.com> (v3)
-
-
-* dl/reset-doc-no-wrt-abbrev (2019-03-06) 1 commit
- (merged to 'next' on 2019-03-20 at 984b4586c7)
- + git-reset.txt: clarify documentation
-
- Doc update.
-
- Will merge to 'master'.
-
-
-* ja/dir-rename-doc-markup-fix (2019-03-06) 1 commit
- (merged to 'next' on 2019-03-20 at f3238df381)
- + Doc: fix misleading asciidoc formating
-
- Doc update.
-
- Will merge to 'master'.
-
-
* 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
* jc/format-patch-error-check (2019-02-22) 2 commits
- - format-patch: notice failure to open cover letter for writing
- - builtin/log: downcase the beginning of error messages
+ (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.
- Will merge to 'next'.
-
-
-* 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).
+ Will merge to 'master'.
* dl/submodule-set-branch (2019-02-08) 3 commits
Needs update before merging to 'next'.
-* br/blame-ignore (2019-02-13) 6 commits
- - SQUASH???
- - blame: add tests for ignoring revisions
+* br/blame-ignore (2019-04-04) 6 commits
+ - RFC blame: use a fingerprint heuristic to match ignored lines
- blame: add a config option to mark ignored lines
- blame: add the ability to ignore commits and their changes
+ - blame: optionally track the line starts during fill_blame_origin()
- blame: use a helper function in blame_chunk()
- Move init_skiplist() outside of fsck
"git blame" learned to "ignore" commits in the history, whose
effects (as well as their presence) get ignored.
- Needs update before merging to 'next'.
+ Expecting a reroll.
+ cf. <8736mtqy9n.fsf@fencepost.gnu.org>
+ cf. <6752a735-2e7b-7d13-799f-a42e6995498c@google.com>
* nd/config-move-to (2019-01-14) 7 commits
* ag/sequencer-reduce-rewriting-todo (2019-03-07) 18 commits
- - 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()
+ (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
around in-core to avoid rewriting the same file over and over
unnecessarily.
- Will merge to 'next'.
+ Will merge to 'master'.
cf. <20190305191805.13561-1-alban.gruin@gmail.com> (v8)
projects / thirdparty / git.git / commitdiff
