To: git@vger.kernel.org
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (Nov 2017, #08; Tue, 28)
+Subject: What's cooking in git.git (Dec 2017, #01; Mon, 4)
X-master-at: 1a4e40aa5dc16564af879142ba9dfbbb88d1e5ff
-X-next-at: 9478a6608122bc94547963754b0a9f2821bb2cfb
+X-next-at: 49b39d22972bb18690a282774c8bc54bea6b63b7
-What's cooking in git.git (Nov 2017, #08; Tue, 28)
+What's cooking in git.git (Dec 2017, #01; Mon, 4)
--------------------------------------------------
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.
-Git 2.15.1 has been tagged, with many of the fixes that have already
-been in 'master'.
-
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"]
-
-* ew/rebase-mboxrd (2017-11-18) 1 commit
- (merged to 'next' on 2017-11-21 at 88eaaac334)
- + rebase: use mboxrd format to avoid split errors
-
- When "git rebase" prepared an mailbox of changes and fed it to "git
- am" to replay them, it was confused when a stray "From " happened
- to be in the log message of one of the replayed changes. This has
- been corrected.
-
-
-* jc/branch-name-sanity (2017-11-15) 4 commits
- (merged to 'next' on 2017-11-20 at 7236b0dde3)
- + builtin/branch: remove redundant check for HEAD
- + branch: correctly reject refs/heads/{-dash,HEAD}
- + branch: split validate_new_branchname() into two
- + branch: streamline "attr_only" handling in validate_new_branchname()
-
- "git branch" and "git checkout -b" are now forbidden from creating
- a branch whose name is "HEAD".
+[New Topics]
+* ab/simplify-perl-makefile (2017-12-04) 1 commit
+ - Makefile: replace perl/Makefile.PL with simple make rules
-* jc/ignore-cr-at-eol (2017-11-08) 2 commits
- (merged to 'next' on 2017-11-20 at 9f7bae7cbd)
- + diff: --ignore-cr-at-eol
- + xdiff: reassign xpparm_t.flags bits
+ The build procedure for perl/ part has been greatly simplified by
+ weaning ourselves off of MakeMaker.
- The "diff" family of commands learned to ignore differences in
- carriage return at the end of line.
+* cc/object-filtering-typofix (2017-12-04) 1 commit
+ - list-objects-filter-options: fix 'keword' typo in comment
+ (this branch uses jh/object-filtering; is tangled with jh/fsck-promisors and jh/partial-clone.)
-* jc/merge-base-fork-point-doc (2017-11-09) 1 commit
- (merged to 'next' on 2017-11-20 at 199b9255b4)
- + merge-base --fork-point doc: clarify the example and failure modes
+ Typofix for a topic already in 'next'.
- Clarify and enhance documentation for "merge-base --fork-point", as
- it was clear what it computed but not why/what for.
+ JeffH said that jh/object-filtering needs further polishing a bit
+ before graduating to 'master', so it would be appreciated if this
+ can also be rolled into such an incremental update.
-* ks/rebase-no-git-foo (2017-11-21) 1 commit
- (merged to 'next' on 2017-11-22 at 336552dbb7)
- + git-rebase: clean up dashed-usages in messages
+* cc/skip-to-optional-val (2017-12-04) 4 commits
+ - diff: use skip_to_optional_val_default()
+ - diff: use skip_to_optional_val()
+ - index-pack: use skip_to_optional_val()
+ - git-compat-util: introduce skip_to_optional_val()
- Mentions of "git-rebase" and "git-am" (dashed form) still remained
- in end-user visible strings emitted by the "git rebase" command;
- they have been corrected.
+ Introduce a helper to simplify code to parse a common pattern that
+ expects either "--key" or "--key=<something>".
+ This may want a final reroll to make it harder to misuse by
+ allowing NULL at the valp part of the argument.
+ cf. <xmqqh8t6o9me.fsf@gitster.mtv.corp.google.com>
+ cf. <xmqqd13uo9d1.fsf@gitster.mtv.corp.google.com>
-* ma/branch-list-paginate (2017-11-20) 3 commits
- (merged to 'next' on 2017-11-22 at eecd7f2369)
- + branch: change default of `pager.branch` to "on"
- + branch: respect `pager.branch` in list-mode only
- + t7006: add tests for how git branch paginates
- "git branch --list" learned to show its output through the pager by
- default when the output is going to a terminal, which is controlled
- by the pager.branch configuration variable. This is similar to a
- recent change to "git tag --list".
+* lb/rebase-i-short-command-names (2017-12-04) 9 commits
+ - t3404: add test case for abbreviated commands
+ - rebase -i: learn to abbreviate command names
+ - rebase -i -x: add exec commands via the rebase--helper
+ - rebase -i: update functions to use a flags parameter
+ - rebase -i: replace reference to sha1 with oid
+ - rebase -i: refactor transform_todo_ids
+ - rebase -i: set commit to null in exec commands
+ - Documentation: use preferred name for the 'todo list' script
+ - Documentation: move rebase.* configs to new file
+ Allow a single-letter command name in the "rebase -i" todo list.
-* pw/sequencer-recover-from-unlockable-index (2017-11-16) 1 commit
- (merged to 'next' on 2017-11-20 at 36f0ed26ce)
- + sequencer: reschedule pick if index can't be locked
+ This may want a final reroll to avoid adding new reference to insn
+ where todo is the more modern term, among other minor things.
+ cf. <xmqq4lp6o4p4.fsf@gitster.mtv.corp.google.com>
- The sequencer machinery (used by "git cherry-pick A..B", and "git
- rebase -i", among other things) would have lost a commit if stopped
- due to an unlockable index file, which has been fixed.
+* ra/prompt-eread-fix (2017-12-04) 2 commits
+ - git-prompt: fix reading files with windows line endings
+ - git-prompt: make __git_eread intended use explicit
-* rs/apply-inaccurate-eof-with-incomplete-line (2017-11-17) 1 commit
- (merged to 'next' on 2017-11-20 at c8aee1d135)
- + apply: update line lengths for --inaccurate-eof
+ Update the shell prompt script (in contrib/) to strip trailing CR
+ from strings read from various "state" files.
- "git apply --inaccurate-eof" when used with "--ignore-space-change"
- triggered an internal sanity check, which has been fixed.
+ Proposed log messages of both commits may need small fixes.
+ cf. <xmqqindmml25.fsf@gitster.mtv.corp.google.com>
+ cf. <alpine.DEB.2.21.1.1712041516280.98586@virtualbox>
-* rs/config-write-section-fix (2017-11-18) 1 commit
- (merged to 'next' on 2017-11-21 at a7f3f93e0c)
- + config: flip return value of write_section()
+* ds/for-each-file-in-obj-micro-optim (2017-12-04) 1 commit
+ - sha1_file: use strbuf_add() instead of strbuf_addf()
- There was a recent semantic mismerge in the codepath to write out a
- section of a configuration section, which has been corrected.
+ The code to iterate over loose object files got optimized.
+ Will merge to 'next'.
-* rs/include-comments-before-the-function-header (2017-11-21) 6 commits
- (merged to 'next' on 2017-11-22 at d7255a836f)
- + grep: show non-empty lines before functions with -W
- + grep: update boundary variable for pre-context
- + t7810: improve check of -W with user-defined function lines
- + xdiff: show non-empty lines before functions with -W
- + xdiff: factor out is_func_rec()
- + t4051: add test for comments preceding function lines
+--------------------------------------------------
+[Stalled]
- "git grep -W", "git diff -W" and their friends learned a heuristic
- to extend a pre-context beyond the line that matches the "function
- pattern" (aka "diff.*.xfuncname") to include a comment block, if
- exists, that immediately precedes it.
+* jc/merge-symlink-ours-theirs (2017-09-26) 1 commit
+ - merge: teach -Xours/-Xtheirs to symbolic link merge
+ "git merge -Xours/-Xtheirs" learned to use our/their version when
+ resolving a conflicting updates to a symbolic link.
-* rv/sendemail-tocmd-in-config-and-completion (2017-11-14) 2 commits
- (merged to 'next' on 2017-11-20 at 75cf6e2fc3)
- + completion: add git config sendemail.tocmd
- + Documentation/config: add sendemail.tocmd to list preceding "See git-send-email(1)"
+ Needs review.
- Teach "sendemail.tocmd" to places that know about "sendemail.to",
- like documentation and shell completion (in contrib/).
+* mg/merge-base-fork-point (2017-09-17) 3 commits
+ - merge-base: find fork-point outside partial reflog
+ - merge-base: return fork-point outside reflog
+ - t6010: test actual test output
-* sb/test-cherry-pick-submodule-getting-in-a-way (2017-11-15) 2 commits
- (merged to 'next' on 2017-11-20 at fe7016689e)
- + merge-recursive: handle addition of submodule on our side of history
- + t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure
+ "merge-base --fork-point $branch $commit" is used to guess on which
+ commit among the commits that were once at the tip of the $branch the
+ $commit was built on top of, and it learns these historical tips from
+ the reflog of the $branch. When the true fork-point is lost due to
+ pruning of old reflog entries, the command does not give any output,
+ because it has no way to guess correctly and does not want to mislead
+ the user with a wrong guess.
- The three-way merge performed by "git cherry-pick" was confused
- when a new submodule was added in the meantime, which has been
- fixed (or "papered over").
+ The command has been updated to give the best but not known to be
+ correct guess, based on a hope that a merge-base between $commit and a
+ virtual merge across all the reflog entries that still are available
+ for $branch may still be a closer to the true fork-point than the
+ merge-base between $commit and the current tip of the $branch.
+ This may have to be offered by an additional option, to allow the
+ users that are prepared to see a potentially incorrect guess to opt
+ into the feature, without affecting the current callers that may not
+ be prepared to accept a guess that is not known to be correct.
-* sd/branch-copy (2017-11-16) 1 commit
- (merged to 'next' on 2017-11-20 at e33bcc460a)
- + config: avoid "write_in_full(fd, buf, len) != len" pattern
+ What's the doneness of this one?
- Code clean-up.
+* jk/drop-ancient-curl (2017-08-09) 5 commits
+ - http: #error on too-old curl
+ - curl: remove ifdef'd code never used with curl >=7.19.4
+ - http: drop support for curl < 7.19.4
+ - http: drop support for curl < 7.16.0
+ - http: drop support for curl < 7.11.1
-* sw/pull-ipv46-passthru (2017-11-21) 1 commit
- (merged to 'next' on 2017-11-22 at b06021eeba)
- + pull: pass -4/-6 option to 'git fetch'
+ Some code in http.c that has bitrot is being removed.
- Contrary to the documentation, "git pull -4/-6 other-args" did not
- ask the underlying "git fetch" to go over IPv4/IPv6, which has been
- corrected.
+ Expecting a reroll.
-* tb/add-renormalize (2017-11-17) 1 commit
- (merged to 'next' on 2017-11-20 at e302f3591f)
- + add: introduce "--renormalize"
+* mk/use-size-t-in-zlib (2017-08-10) 1 commit
+ . zlib.c: use size_t for size
- "git add --renormalize ." is a new and safer way to record the fact
- that you are correcting the end-of-line convention and other
- "convert_to_git()" glitches in the in-repository data.
+ 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".
+ Needs resurrecting by making sure the fix is good and still applies
+ (or adjusted to today's codebase).
-* tz/complete-branch-copy (2017-11-17) 1 commit
- (merged to 'next' on 2017-11-20 at 6d22384fcd)
- + completion: add '--copy' option to 'git branch'
- Command line completion (in contrib/) has been taught about the
- "--copy" option of "git branch".
+* mg/status-in-progress-info (2017-05-10) 2 commits
+ - status --short --inprogress: spell it as --in-progress
+ - status: show in-progress info for short status
+ "git status" learns an option to report various operations
+ (e.g. "merging") that the user is in the middle of.
-* tz/notes-error-to-stderr (2017-11-15) 1 commit
- (merged to 'next' on 2017-11-20 at a45d441ee2)
- + notes: send "Automatic notes merge failed" messages to stderr
+ cf. <xmqqmvakcdqw.fsf@gitster.mtv.corp.google.com>
- "git notes" sent its error message to its standard output stream,
- which was corrected.
+* nd/worktree-move (2017-04-20) 6 commits
+ - worktree remove: new command
+ - worktree move: refuse to move worktrees with submodules
+ - worktree move: accept destination as directory
+ - worktree move: new command
+ - worktree.c: add update_worktree_location()
+ - worktree.c: add validate_worktree()
-* tz/redirect-fix (2017-11-14) 2 commits
- (merged to 'next' on 2017-11-20 at 5b13f7026e)
- + rebase: fix stderr redirect in apply_autostash()
- + t/lib-gpg: fix gpgconf stderr redirect to /dev/null
+ "git worktree" learned move and remove subcommands.
- A few scripts (both in production and tests) incorrectly redirected
- their error output. These have been corrected.
+ Expecting a reroll.
+ cf. <20170420101024.7593-1-pclouds@gmail.com>
+ cf. <20170421145916.mknekgqzhxffu7di@sigill.intra.peff.net>
+ cf. <d0e81b1e-5869-299e-f462-4d43dc997bd1@ramsayjones.plus.com>
--------------------------------------------------
-[New Topics]
+[Cooking]
* en/merge-recursive-icase-removal (2017-11-27) 1 commit
- merge-recursive: ignore_case shouldn't reject intentional removals
Will merge to 'next'.
-* cc/require-tcl-tk-for-build (2017-11-27) 1 commit
+* cc/require-tcl-tk-for-build (2017-11-29) 2 commits
+ - travis-ci: avoid new tcl/tk build requirement
- Makefile: check that tcl/tk is installed
A first-time builder of Git may have installed neither tclsh nor
Will merge to 'next'.
---------------------------------------------------
-[Stalled]
-
-* jc/merge-symlink-ours-theirs (2017-09-26) 1 commit
- - merge: teach -Xours/-Xtheirs to symbolic link merge
-
- "git merge -Xours/-Xtheirs" learned to use our/their version when
- resolving a conflicting updates to a symbolic link.
-
- Needs review.
-
-
-* mg/merge-base-fork-point (2017-09-17) 3 commits
- - merge-base: find fork-point outside partial reflog
- - merge-base: return fork-point outside reflog
- - t6010: test actual test output
-
- "merge-base --fork-point $branch $commit" is used to guess on which
- commit among the commits that were once at the tip of the $branch the
- $commit was built on top of, and it learns these historical tips from
- the reflog of the $branch. When the true fork-point is lost due to
- pruning of old reflog entries, the command does not give any output,
- because it has no way to guess correctly and does not want to mislead
- the user with a wrong guess.
-
- The command has been updated to give the best but not known to be
- correct guess, based on a hope that a merge-base between $commit and a
- virtual merge across all the reflog entries that still are available
- for $branch may still be a closer to the true fork-point than the
- merge-base between $commit and the current tip of the $branch.
-
- This may have to be offered by an additional option, to allow the
- users that are prepared to see a potentially incorrect guess to opt
- into the feature, without affecting the current callers that may not
- be prepared to accept a guess that is not known to be correct.
-
- What's the doneness of this one?
-
-
-* jk/drop-ancient-curl (2017-08-09) 5 commits
- - http: #error on too-old curl
- - curl: remove ifdef'd code never used with curl >=7.19.4
- - http: drop support for curl < 7.19.4
- - http: drop support for curl < 7.16.0
- - http: drop support for curl < 7.11.1
-
- Some code in http.c that has bitrot is being removed.
-
- Expecting a reroll.
-
-
-* mk/use-size-t-in-zlib (2017-08-10) 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".
-
- Needs resurrecting by making sure the fix is good and still applies
- (or adjusted to today's codebase).
-
-
-* mg/status-in-progress-info (2017-05-10) 2 commits
- - status --short --inprogress: spell it as --in-progress
- - status: show in-progress info for short status
-
- "git status" learns an option to report various operations
- (e.g. "merging") that the user is in the middle of.
-
- cf. <xmqqmvakcdqw.fsf@gitster.mtv.corp.google.com>
-
-
-* nd/worktree-move (2017-04-20) 6 commits
- - worktree remove: new command
- - worktree move: refuse to move worktrees with submodules
- - worktree move: accept destination as directory
- - worktree move: new command
- - worktree.c: add update_worktree_location()
- - worktree.c: add validate_worktree()
-
- "git worktree" learned move and remove subcommands.
-
- Expecting a reroll.
- cf. <20170420101024.7593-1-pclouds@gmail.com>
- cf. <20170421145916.mknekgqzhxffu7di@sigill.intra.peff.net>
- cf. <d0e81b1e-5869-299e-f462-4d43dc997bd1@ramsayjones.plus.com>
-
---------------------------------------------------
-[Cooking]
* en/rename-directory-detection (2017-11-21) 33 commits
- merge-recursive: ensure we write updates for directory-renamed file
* dj/runtime-prefix (2017-11-28) 4 commits
- - exec_cmd: RUNTIME_PREFIX on some POSIX systems
- - Makefile: add Perl runtime prefix support
- - Makefile: add support for "perllibdir"
- - Makefile: generate Perl header from template file
+ . exec_cmd: RUNTIME_PREFIX on some POSIX systems
+ . Makefile: add Perl runtime prefix support
+ . Makefile: add support for "perllibdir"
+ . Makefile: generate Perl header from template file
A build-time option has been added to allow Git to be told to refer
to its associated files relative to the main binary, in the same
way that has been possible on Windows for quite some time, for
Linux, BSDs and Darwin.
- Will merge to 'next'.
+ Tentatively kicked out of 'next' to see how well another topic
+ ab/simplify-perl-makefile that heavily conflicts with this fares.
-* jc/editor-waiting-message (2017-11-17) 1 commit
+* ls/editor-waiting-message (2017-12-04) 2 commits
- launch_editor(): indicate that Git waits for user input
+ - refactor "dumb" terminal determination
Git shows a message to tell the user that it is waiting for the
user to finish editing when spawning an editor, in case the editor
opens to a hidden window or somewhere obscure and the user gets
lost.
- Will merge to 'next'.
+ Still being bikeshed on, but hopefully the final is getting closer.
+ This is at its v4.
* tz/branch-doc-remove-set-upstream (2017-11-17) 1 commit
Will merge to 'master'.
-* en/rename-progress (2017-11-15) 4 commits
+* en/rename-progress (2017-12-02) 5 commits
+ (merged to 'next' on 2017-12-04 at 49b39d2297)
+ + diffcore-rename: make diff-tree -l0 mean -l<large>
(merged to 'next' on 2017-11-20 at 77a2e0ddd9)
+ sequencer: show rename progress during cherry picks
+ diff: remove silent clamp of renameLimit
hardcoded limit of 32k paths; this is being lifted to allow users
trade cycles with a (possibly) easier to read result.
- Will cook in 'next'.
+ Will merge to 'master'.
-* ar/unconfuse-three-dots (2017-11-26) 8 commits
+* ar/unconfuse-three-dots (2017-12-04) 7 commits
- t4013: test new output from diff --abbrev --raw
+ - diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value
- t4013: prepare for upcoming "diff --raw --abbrev" output format change
- - Testing: provide existing tests requiring them with ellipses after SHA-1 values
- - Documentation: git: document GIT_PRINT_SHA1_ELLIPSIS
- - Documentation: revisions: fix typo: "three dot" ---> "three-dot" (in line with "two-dot").
- - Documentation: user-manual: limit usage of ellipsis
- checkout: describe_detached_head: remove ellipsis after committish
- - diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value
+ - print_sha1_ellipsis: introduce helper
+ - Documentation: user-manual: limit usage of ellipsis
+ - Documentation: revisions: fix typo: "three dot" ---> "three-dot" (in line with "two-dot").
Ancient part of codebase still shows dots after an abbreviated
object name just to show that it is not a full object name, but
who are used to seeing abbreviated object names and find them
confusing with the range syntax.
+ Almost there.
+ cf. <xmqqshcqmoe7.fsf@gitster.mtv.corp.google.com>
+
* jh/object-filtering (2017-11-22) 6 commits
(merged to 'next' on 2017-11-27 at e5008c3b28)
+ oidset: add iterator methods to oidset
+ oidmap: add oidmap iterator methods
+ dir: allow exclusions from blob in addition to file
- (this branch is used by jh/fsck-promisors and jh/partial-clone.)
+ (this branch is used by cc/object-filtering-typofix, jh/fsck-promisors and jh/partial-clone.)
In preparation for implementing narrow/partial clone, the object
walking machinery has been taught a way to tell it to "filter" some
objects from enumeration.
- Will merge to 'master'.
+ Expecting incremental updates for a finishing touch.
* jh/fsck-promisors (2017-11-22) 10 commits
- fsck: support refs pointing to promisor objects
- fsck: introduce partialclone extension
- extension.partialclone: introduce partial clone extension
- (this branch is used by jh/partial-clone; uses jh/object-filtering.)
+ (this branch is used by jh/partial-clone; uses jh/object-filtering; is tangled with cc/object-filtering-typofix.)
In preparation for implementing narrow/partial clone, the machinery
for checking object connectivity used by gc and fsck has been
- fetch: refactor calculation of remote list
- clone, fetch-pack, index-pack, transport: partial clone
- upload-pack: add object filtering for partial clone
- (this branch uses jh/fsck-promisors and jh/object-filtering.)
+ (this branch uses jh/fsck-promisors and jh/object-filtering; is tangled with cc/object-filtering-typofix.)
The machinery to clone & fetch, which in turn involves packing and
unpacking objects, have been told how to omit certain objects using
projects / thirdparty / git.git / commitdiff
