To: git@vger.kernel.org
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (Nov 2017, #02; Mon, 6)
+Subject: What's cooking in git.git (Nov 2017, #03; Wed, 8)
X-master-at: 7668cbc60578f99a4c048f8f8f38787930b8147b
-X-next-at: f294e3d99a357e12ccf7ade78a150fe6de4f7826
+X-next-at: 9af6a3dea062db2d4b3807c453d2f678c7f12e9c
-What's cooking in git.git (Nov 2017, #02; Mon, 6)
+What's cooking in git.git (Nov 2017, #03; Wed, 8)
--------------------------------------------------
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.
-Early batches for the next cycle has been merged to 'master' and
-'next' has become thin enough so that we can rewind it and rebuild
-it as usual, optionally with a handful of topics kicked out of it.
-That hasn't happened yet, but it will shortly.
+The tip of 'next' has been rebuilt on top of v2.15, while kicking a
+few topics back to 'pu'.
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"]
-
-* ao/check-resolve-ref-unsafe-result (2017-10-21) 1 commit
- (merged to 'next' on 2017-10-26 at 84302ab59a)
- + commit: check result of resolve_ref_unsafe
-
- "git commit", after making a commit, did not check for errors when
- asking on what branch it made the commit, which has been correted.
-
-
-* bc/object-id (2017-10-16) 25 commits
- (merged to 'next' on 2017-10-18 at ef8aa2698d)
- + refs/files-backend: convert static functions to object_id
- + refs: convert read_raw_ref backends to struct object_id
- + refs: convert peel_object to struct object_id
- + refs: convert resolve_ref_unsafe to struct object_id
- + worktree: convert struct worktree to object_id
- + refs: convert resolve_gitlink_ref to struct object_id
- + Convert remaining callers of resolve_gitlink_ref to object_id
- + sha1_file: convert index_path and index_fd to struct object_id
- + refs: convert reflog_expire parameter to struct object_id
- + refs: convert read_ref_at to struct object_id
- + refs: convert peel_ref to struct object_id
- + builtin/pack-objects: convert to struct object_id
- + pack-bitmap: convert traverse_bitmap_commit_list to object_id
- + refs: convert dwim_log to struct object_id
- + builtin/reflog: convert remaining unsigned char uses to object_id
- + refs: convert dwim_ref and expand_ref to struct object_id
- + refs: convert read_ref and read_ref_full to object_id
- + refs: convert resolve_refdup and refs_resolve_refdup to struct object_id
- + Convert check_connected to use struct object_id
- + refs: update ref transactions to use struct object_id
- + refs: prevent accidental NULL dereference in write_pseudoref
- + refs: convert update_ref and refs_update_ref to use struct object_id
- + refs: convert delete_ref and refs_delete_ref to struct object_id
- + refs/files-backend: convert struct ref_to_prune to object_id
- + walker: convert to struct object_id
- (this branch is used by mh/tidy-ref-update-flags.)
-
- Conversion from uchar[20] to struct object_id continues.
-
-
-* bw/grep-recurse-submodules (2017-11-02) 1 commit
- (merged to 'next' on 2017-11-02 at 50bbebe9e3)
- + grep: take the read-lock when adding a submodule
-
- A broken access to object databases in recent update to "git grep
- --recurse-submodules" has been fixed.
-
-
-* cn/diff-indent-no-longer-is-experimental (2017-11-02) 1 commit
- (merged to 'next' on 2017-11-02 at d3fe3952a7)
- + diff: --indent-heuristic is no longer experimental
-
- Doc update.
-
-
-* dm/run-command-ignored-hook-advise (2017-10-10) 1 commit
- (merged to 'next' on 2017-10-10 at 0827814922)
- + run-command: add hint when a hook is ignored
-
- A hook script that is set unexecutable is simply ignored. Git
- notifies when such a file is ignored, unless the message is
- squelched via advice.ignoredHook configuration.
-
-
-* ds/find-unique-abbrev-optim (2017-10-13) 4 commits
- (merged to 'next' on 2017-10-16 at 7f4479ac52)
- + sha1_name: minimize OID comparisons during disambiguation
- + sha1_name: parse less while finding common prefix
- + sha1_name: unroll len loop in find_unique_abbrev_r()
- + p4211-line-log.sh: add log --online --raw --parents perf test
-
- Optimize the code to find shortest unique prefix of object names.
-
-
-* ex/deprecate-empty-pathspec-as-match-all (2017-06-23) 2 commits
- (merged to 'next' on 2017-08-14 at 24db08a6e8)
- + pathspec: die on empty strings as pathspec
- + t0027: do not use an empty string as a pathspec element
-
- The final step to make an empty string as a pathspec element
- illegal. We started this by first deprecating and warning a
- pathspec that has such an element in 2.11 (Nov 2016).
-
-
-* gc/gitweb-filetest-acl (2017-10-24) 1 commit
- (merged to 'next' on 2017-10-26 at 5b490f53bf)
- + gitweb: use filetest to allow ACLs
-
- "gitweb" checks if a directory is searchable with Perl's "-x"
- operator, which can be enhanced by using "filetest 'access'"
- pragma, which now we do.
-
-
-* hv/fetch-moved-submodules-on-demand (2017-10-17) 3 commits
- (merged to 'next' on 2017-10-26 at c446ea3e9a)
- + submodule: simplify decision tree whether to or not to fetch
- + implement fetching of moved submodules
- + fetch: add test to make sure we stay backwards compatible
-
- "git fetch --recurse-submodules" now knows that submodules can be
- moved around in the superproject in addition to getting updated,
- and finds the ones that need to be fetched accordingly.
-
-
-* jc/check-ref-format-oor (2017-10-18) 3 commits
- (merged to 'next' on 2017-10-18 at 8b17566c80)
- + check-ref-format doc: --branch validates and expands <branch>
- + check-ref-format --branch: strip refs/heads/ using skip_prefix
- + check-ref-format --branch: do not expand @{...} outside repository
-
- "git check-ref-format --branch @{-1}" bit a "BUG()" when run
- outside a repository for obvious reasons; clarify the documentation
- and make sure we do not even try to expand the at-mark magic in
- such a case, but still call the validation logic for branch names.
-
-
-* jc/no-cmd-as-subroutine (2017-10-11) 2 commits
- (merged to 'next' on 2017-10-16 at 5f4ee919ac)
- + merge-ours: do not use cmd_*() as a subroutine
- + describe: do not use cmd_*() as a subroutine
-
- Calling cmd_foo() as if it is a general purpose helper function is
- a no-no. Correct two instances of such to set an example.
-
-
-* jc/t5601-copy-workaround (2017-10-17) 1 commit
- (merged to 'next' on 2017-10-18 at ea1e133968)
- + t5601: rm the target file of cp that could still be executing
+[New Topics]
- A (possibly flakey) test fix.
+* bw/rebase-i-ignored-submodule-fix (2017-11-07) 1 commit
+ - wt-status: actually ignore submodules when requested
+ "git rebase -i" recently started misbehaving when a submodule that
+ is configured with 'submodule.<name>.ignore' is dirty; this has
+ been corrected.
-* jk/diff-color-moved-fix (2017-10-21) 5 commits
- (merged to 'next' on 2017-10-26 at eb580e4c8c)
- + diff: handle NULs in get_string_hash()
- + diff: fix whitespace-skipping with --color-moved
- + t4015: test the output of "diff --color-moved -b"
- + t4015: check "negative" case for "-w --color-moved"
- + t4015: refactor --color-moved whitespace test
- (this branch is used by sb/diff-color-moved-use-xdl-recmatch.)
+ Will merge to 'next'.
+ I've edited in the tweak brought up in the discussion. Please
+ eyeball to sanity check.
- The experimental "color moved lines differently in diff output"
- feature was buggy around "ignore whitespace changes" edges, whihch
- has been corrected.
+* ar/unconfuse-three-dots (2017-11-07) 3 commits
+ - Documentation: revisions: add note about 3dots usages as continuation indications
+ - Documentation: user-manual: limit potentially confusing usage of 3dots (and 2dots)
+ - checkout: describe_detached_head: remove 3dots after committish
-* jk/misc-resolve-ref-unsafe-fixes (2017-10-21) 4 commits
- (merged to 'next' on 2017-10-26 at c327b2ec2f)
- + worktree: handle broken symrefs in find_shared_symref()
- + log: handle broken HEAD in decoration check
- + remote: handle broken symrefs
- + test-ref-store: avoid passing NULL to printf
+ Ancient part of codebase still shows dots after an abbreviated
+ object name just to show that it is not a full object name, but
+ these ellipses are confusing to people who newly discovered Git
+ who are used to seeing abbreviated object names and find them
+ confusing with the range syntax.
- Some codepaths did not check for errors when asking what branch the
- HEAD points at, which have been fixed.
+* jt/submodule-tests-cleanup (2017-11-08) 1 commit
+ - Tests: clean up and document submodule helpers
-* jk/rebase-i-exec-gitdir-fix (2017-11-02) 1 commit
- (merged to 'next' on 2017-11-02 at 9a519c7150)
- + sequencer: pass absolute GIT_DIR to exec commands
+ Will merge to 'next'.
- A recent regression in "git rebase -i" that broke execution of git
- commands from subdirectories via "exec" insn has been fixed.
+--------------------------------------------------
+[Stalled]
+* jn/ssh-wrappers (2017-10-30) 6 commits
+ - fixup! ssh: 'auto' variant to select between 'ssh' and 'simple'
+ - ssh: 'simple' variant does not support --port
+ - ssh: 'simple' variant does not support -4/-6
+ - ssh: 'auto' variant to select between 'ssh' and 'simple'
+ - connect: split ssh command line options into separate function
+ - connect: split git:// setup into a separate function
+ (this branch uses bw/protocol-v1.)
-* jk/revision-pruning-optim (2017-10-14) 1 commit
- (merged to 'next' on 2017-10-16 at 2662baa21d)
- + revision: quit pruning diff more quickly when possible
+ The ssh-variant 'simple' introduced earlier broke existing
+ installations by not passing --port/-4/-6 and not diagnosing an
+ attempt to pass these as an error. Instead, default to
+ automatically detect how compatible the GIT_SSH/GIT_SSH_COMMAND is
+ to OpenSSH convention and then error out an invocation to make it
+ easier to diagnose connection errors.
- Pathspec-limited revision traversal was taught not to keep finding
- unneeded differences once it knows two trees are different inside
- given pathspec.
+ Expecting a reroll.
+ cf. <20171025163243.xmm7szrkwgblpgcc@aiede.mtv.corp.google.com>
-* js/submodule-in-excluded (2017-10-26) 1 commit
- (merged to 'next' on 2017-10-26 at 2a262e6a0b)
- + status: do not get confused by submodules in excluded directories
+* jc/merge-symlink-ours-theirs (2017-09-26) 1 commit
+ - merge: teach -Xours/-Xtheirs to symbolic link merge
- "git status --ignored -u" did not stop at a working tree of a
- separate project that is embedded in an ignored directory and
- listed files in that other project, instead of just showing the
- directory itself as ignored.
+ "git merge -Xours/-Xtheirs" learned to use our/their version when
+ resolving a conflicting updates to a symbolic link.
+ Needs review.
-* kd/auto-col-with-pager-fix (2017-10-24) 2 commits
- (merged to 'next' on 2017-10-24 at ef3ff0f14b)
- + column: do not include pager.c
- (merged to 'next' on 2017-10-18 at fe89ff7e83)
- + column: show auto columns when pager is active
- "auto" as a value for the columnar output configuration ought to
- judge "is the output consumed by humans?" with the same criteria as
- "auto" for coloured output configuration, i.e. either the standard
- output stream is going to tty, or a pager is in use. We forgot the
- latter, which has been fixed.
+* 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.
-* ma/lockfile-fixes (2017-10-07) 12 commits
- (merged to 'next' on 2017-10-16 at 19fae5c138)
- + read_cache: roll back lock in `update_index_if_able()`
- + read-cache: leave lock in right state in `write_locked_index()`
- + read-cache: drop explicit `CLOSE_LOCK`-flag
- + cache.h: document `write_locked_index()`
- + apply: remove `newfd` from `struct apply_state`
- + apply: move lockfile into `apply_state`
- + cache-tree: simplify locking logic
- + checkout-index: simplify locking logic
- + tempfile: fix documentation on `delete_tempfile()`
- + lockfile: fix documentation on `close_lock_file_gently()`
- + treewide: prefer lockfiles on the stack
- + sha1_file: do not leak `lock_file`
+ 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.
- An earlier update made it possible to use an on-stack in-core
- lockfile structure (as opposed to having to deliberately leak an
- on-heap one). Many codepaths have been updated to take advantage
- of this new facility.
+ 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?
-* mh/test-local-canary (2017-10-31) 1 commit
- (merged to 'next' on 2017-11-02 at f34927f687)
- + t0000: check whether the shell supports the "local" keyword
- We try to see if somebody runs our test suite with a shell that
- does not support "local" like bash/dash does.
+* cc/perf-run-config (2017-09-24) 9 commits
+ - perf: store subsection results in "test-results/$GIT_PERF_SUBSECTION/"
+ - perf/run: show name of rev being built
+ - perf/run: add run_subsection()
+ - perf/run: update get_var_from_env_or_config() for subsections
+ - perf/run: add get_subsections()
+ - perf/run: add calls to get_var_from_env_or_config()
+ - perf/run: add GIT_PERF_DIRS_OR_REVS
+ - perf/run: add get_var_from_env_or_config()
+ - perf/run: add '--config' option to the 'run' script
+ Needs review.
-* mp/push-pushoption-config (2017-10-24) 1 commit
- (merged to 'next' on 2017-10-26 at 2c72164d12)
- + builtin/push.c: add push.pushOption config
- The "--push-option=<string>" option to "git push" now defaults to a
- list of strings configured via push.pushOption variable.
+* 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.
-* pb/bisect-helper (2017-10-06) 6 commits
- (merged to 'next' on 2017-10-13 at ffc9aefe63)
- + bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
- + t6030: explicitly test for bisection cleanup
- + bisect--helper: `bisect_clean_state` shell function in C
- + bisect--helper: `write_terms` shell function in C
- + bisect--helper: rewrite `check_term_format` shell function in C
- + bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
- (this branch is used by pb/bisect-helper-2.)
+ Expecting a reroll.
- An early part of piece-by-piece rewrite of "git bisect".
+* mk/use-size-t-in-zlib (2017-08-10) 1 commit
+ . zlib.c: use size_t for size
-* pc/submodule-helper (2017-10-07) 3 commits
- (merged to 'next' on 2017-10-16 at 2b38de12cc)
- + submodule: port submodule subcommand 'status' from shell to C
- + submodule--helper: introduce for_each_listed_submodule()
- + submodule--helper: introduce get_submodule_displaypath()
+ 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".
- GSoC.
+ Needs resurrecting by making sure the fix is good and still applies
+ (or adjusted to today's codebase).
-* sb/diff-color-moved-use-xdl-recmatch (2017-10-26) 2 commits
- (merged to 'next' on 2017-10-26 at 6711f24498)
- + diff.c: get rid of duplicate implementation
- + xdiff-interface: export comparing and hashing strings
- (this branch uses jk/diff-color-moved-fix.)
+* 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
- Instead of using custom line comparison and hashing functions to
- implement "moved lines" coloring in the diff output, use the pair
- of these functions from lower-layer xdiff/ code.
+ "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>
-* tb/complete-checkout (2017-10-25) 1 commit
- (merged to 'next' on 2017-10-26 at beeaf5b00c)
- + completion: add remaining flags to checkout
- Command line completion (in contrib/) update.
+* 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.
-* tg/deprecate-stash-save (2017-10-27) 3 commits
- (merged to 'next' on 2017-10-27 at 73b1edb73b)
- + stash: remove now superfluos help for "stash push"
- + stash: mark "git stash save" deprecated in the man page
- + stash: replace "git stash save" with "git stash push" in the documentation
+ 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>
- "git stash save" has been deprecated in favour of "git stash push".
+--------------------------------------------------
+[Cooking]
+* js/for-each-ref-remote-name-and-ref (2017-11-08) 3 commits
+ - for-each-ref: test :remotename and :remoteref
+ - for-each-ref: let upstream/push report the remote ref name
+ - for-each-ref: let upstream/push optionally report the remote name
-* wk/pull-signoff (2017-10-13) 1 commit
- (merged to 'next' on 2017-10-16 at 5e48f349d9)
- + pull: pass --signoff/--no-signoff to "git merge"
+ The "--format=..." option "git for-each-ref" takes learned to show
+ the name of the 'remote' repository and the ref at the remote side
+ that is affected for 'upstream' and 'push' via "%(push:remotename)"
+ and friends.
- "git pull" has been taught to accept "--[no-]signoff" option and
- pass it down to "git merge".
+ Will merge to 'next'.
---------------------------------------------------
-[New Topics]
* js/mingw-redirect-std-handles (2017-11-02) 3 commits
- - mingw: document the standard handle redirection
- - mingw: optionally redirect stderr/stdout via the same handle
- - mingw: add experimental feature to redirect standard handles
+ (merged to 'next' on 2017-11-07 at 9af6a3dea0)
+ + mingw: document the standard handle redirection
+ + mingw: optionally redirect stderr/stdout via the same handle
+ + mingw: add experimental feature to redirect standard handles
MinGW updates.
- Will merge to 'next'.
+ Will merge to 'master'.
* ma/bisect-leakfix (2017-11-06) 4 commits
Will merge to 'next'.
-* ma/reduce-heads-leakfix (2017-11-06) 2 commits
+* ma/reduce-heads-leakfix (2017-11-08) 2 commits
- reduce_heads: fix memory leaks
- - builtin/merge-base: UNLEAK commit lists
+ - builtin/merge-base: free commit lists
Leak fixes.
* sg/travis-fixes (2017-11-02) 2 commits
- - travis-ci: don't build Git for the static analysis job
- - travis-ci: fix running P4 and Git LFS tests in Linux build jobs
+ (merged to 'next' on 2017-11-07 at bbf39361b6)
+ + travis-ci: don't build Git for the static analysis job
+ + travis-ci: fix running P4 and Git LFS tests in Linux build jobs
TravisCI build updates.
- Will merge to 'next'.
+ Will merge to 'master'.
* sr/wrapper-quote-filenames (2017-11-06) 1 commit
Will merge to 'next'.
-* jh/fsck-promisors (2017-11-03) 9 commits
+* jh/fsck-promisors (2017-11-08) 9 commits
- gc: do not repack promisor packfiles
- sha1_file: support lazily fetching missing objects
- introduce fetch-object: fetch one promisor object
(this branch is used by jh/partial-clone; uses jh/object-filtering.)
-* jh/object-filtering (2017-11-03) 6 commits
+* jh/object-filtering (2017-11-08) 6 commits
- pack-objects: add list-objects filtering
- rev-list: add list-objects filtering support
- list-objects: filter objects in traverse_commit_list
(this branch is used by jh/fsck-promisors and jh/partial-clone.)
-* jh/partial-clone (2017-11-03) 14 commits
+* jh/partial-clone (2017-11-08) 15 commits
+ - fixup! upload-pack: add object filtering for partial clone
- index-pack: silently assume missing objects are promisor
- fetch-pack: restore save_commit_buffer after use
- unpack-trees: batch fetching of missing blobs
* js/early-config (2017-11-03) 1 commit
- - setup: avoid double slashes when looking for HEAD
+ (merged to 'next' on 2017-11-07 at 9477c7c8ea)
+ + setup: avoid double slashes when looking for HEAD
- Correct start-up sequence so that a repository could hang
+ Correct start-up sequence so that a repository could be placed
immediately under the root directory again (which was broken at
around Git 2.13).
- Will merge to 'next'.
+ Will merge to 'master'.
* ks/mailmap (2017-11-03) 1 commit
- - mailmap: use Kaartic Sivaraam's new address
+ (merged to 'next' on 2017-11-07 at 46975637c7)
+ + mailmap: use Kaartic Sivaraam's new address
- Will merge to 'next'.
+ Will merge to 'master'.
* rs/imap-send-next-arg-fix (2017-11-03) 2 commits
- - imap-send: handle missing response codes gracefully
- - imap-send: handle NULL return of next_arg()
+ (merged to 'next' on 2017-11-07 at f4df55fe5b)
+ + imap-send: handle missing response codes gracefully
+ + imap-send: handle NULL return of next_arg()
Error checking in "git imap-send" for empty response has been
improved.
- Will merge to 'next'.
+ Will merge to 'master'.
* dk/libsecret-unlock-to-load-fix (2017-11-04) 1 commit
- - credential-libsecret: unlock locked secrets
+ (merged to 'next' on 2017-11-07 at 57d1d76c8c)
+ + credential-libsecret: unlock locked secrets
The credential helper for libsecret (in contrib/) has been improved
to allow possibly prompting the end user to unlock secrets that are
currently locked (otherwise the secrets may not be loaded).
- Will merge to 'next'.
+ Will merge to 'master'.
* jm/relnotes-2.15-typofix (2017-11-06) 1 commit
- - fix typos in 2.15.0 release notes
-
- Will merge to 'next'.
+ (merged to 'next' on 2017-11-07 at 60fc937b62)
+ + fix typos in 2.15.0 release notes
+ Typofix.
-* sb/blame-config-doc (2017-11-06) 1 commit
- - config: document blame configuration
-
- Will merge to 'next'.
-
---------------------------------------------------
-[Stalled]
-
-* jn/ssh-wrappers (2017-10-30) 6 commits
- - fixup! ssh: 'auto' variant to select between 'ssh' and 'simple'
- - ssh: 'simple' variant does not support --port
- - ssh: 'simple' variant does not support -4/-6
- - ssh: 'auto' variant to select between 'ssh' and 'simple'
- - connect: split ssh command line options into separate function
- - connect: split git:// setup into a separate function
- (this branch uses bw/protocol-v1.)
-
- The ssh-variant 'simple' introduced earlier broke existing
- installations by not passing --port/-4/-6 and not diagnosing an
- attempt to pass these as an error. Instead, default to
- automatically detect how compatible the GIT_SSH/GIT_SSH_COMMAND is
- to OpenSSH convention and then error out an invocation to make it
- easier to diagnose connection errors.
-
- Expecting a reroll.
- cf. <20171025163243.xmm7szrkwgblpgcc@aiede.mtv.corp.google.com>
-
-
-* js/for-each-ref-remote-name-and-ref (2017-10-11) 3 commits
- - for-each-ref: test :remotename and :remoteref
- - for-each-ref: let upstream/push optionally report the remote ref name
- - for-each-ref: let upstream/push optionally report the remote name
-
- The "--format=..." option "git for-each-ref" takes learned to show
- the name of the 'remote' repository and the ref at the remote side
- that is affected for 'upstream' and 'push' via "%(push:remotename)"
- and friends.
-
- Needs a bit more work on the documentation part.
-
-
-* 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?
-
-
-* cc/perf-run-config (2017-09-24) 9 commits
- - perf: store subsection results in "test-results/$GIT_PERF_SUBSECTION/"
- - perf/run: show name of rev being built
- - perf/run: add run_subsection()
- - perf/run: update get_var_from_env_or_config() for subsections
- - perf/run: add get_subsections()
- - perf/run: add calls to get_var_from_env_or_config()
- - perf/run: add GIT_PERF_DIRS_OR_REVS
- - perf/run: add get_var_from_env_or_config()
- - perf/run: add '--config' option to the 'run' script
-
- Needs review.
-
-
-* 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>
+ Will merge to 'master'.
-* 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()
+* sb/blame-config-doc (2017-11-06) 1 commit
+ (merged to 'next' on 2017-11-07 at 0576cb452f)
+ + config: document blame configuration
- "git worktree" learned move and remove subcommands.
+ Description of blame.{showroot,blankboundary,showemail,date}
+ configuration variables have been added to "git config --help".
- 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>
+ Will merge to 'master'.
---------------------------------------------------
-[Cooking]
* ad/5580-unc-tests-on-cygwin (2017-11-01) 1 commit
- - t5580: add Cygwin support
+ (merged to 'next' on 2017-11-07 at 34fc479da2)
+ + t5580: add Cygwin support
UNC paths are also relevant in Cygwin builds and they are now
tested just like Mingw builds.
- Will merge to 'next'.
+ Will merge to 'master'.
* ao/merge-verbosity-getenv-just-once (2017-11-01) 1 commit
Will merge to 'next'.
-* bp/read-index-from-skip-verification (2017-11-01) 1 commit
- - read_index_from(): speed index loading by skiping verification of the entry order
+* bp/read-index-from-skip-verification (2017-11-08) 1 commit
+ - read_index_from(): speed index loading by skipping verification of the entry order
Drop (perhaps overly cautious) sanity check before using the index
read from the filesystem at runtime.
* rs/hex-to-bytes-cleanup (2017-11-01) 3 commits
- - sha1_file: use hex_to_bytes()
- - http-push: use hex_to_bytes()
- - notes: move hex_to_bytes() to hex.c and export it
+ (merged to 'next' on 2017-11-07 at fac14770e1)
+ + sha1_file: use hex_to_bytes()
+ + http-push: use hex_to_bytes()
+ + notes: move hex_to_bytes() to hex.c and export it
Code cleanup.
- Will merge to 'next'.
+ Will merge to 'master'.
* rs/sequencer-rewrite-file-cleanup (2017-11-02) 3 commits
<commit-ish>:<path> that refers to a given blob object.
-* tb/add-renormalize (2017-10-31) 1 commit
+* tb/add-renormalize (2017-11-07) 2 commits
+ - SQUASH???
- add: introduce "--renormalize"
"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.
- Needs review.
-
* ab/mediawiki-name-truncation (2017-11-01) 1 commit
- - remote-mediawiki: limit filenames to legal
+ (merged to 'next' on 2017-11-07 at b30233d585)
+ + remote-mediawiki: limit filenames to legal
The remote-helper for talking to MediaWiki has been updated to
truncate an overlong pagename so that ".mw" suffix can still be
added.
- Will merge to 'next'.
+ Will merge to 'master'.
-* ab/mediawiki-namespace (2017-11-03) 7 commits
+* ab/mediawiki-namespace (2017-11-08) 7 commits
- remote-mediawiki: show progress while fetching namespaces
- remote-mediawiki: process namespaces in order
- remote-mediawiki: support fetching from (Main) namespace
The remote-helper for talking to MediaWiki has been updated to
work with mediawiki namespaces.
- Are we expecting another round for v4? What is queued above came
- as <20171102212518.1601-8-anarcat@debian.org> and marked v3.
- cf. <87375w5qdw.fsf@curie.anarc.at>
+ Will merge to 'next'.
* js/mingw-full-version-in-resources (2017-11-01) 1 commit
- - mingw: include the full version information in the resources
+ (merged to 'next' on 2017-11-07 at 3a256b5ddc)
+ + mingw: include the full version information in the resources
MinGW updates.
- Will merge to 'next'.
+ Will merge to 'master'.
* js/wincred-empty-cred (2017-11-01) 2 commits
- - wincred: handle empty username/password correctly
- - t0302: check helper can handle empty credentials
+ (merged to 'next' on 2017-11-07 at 43d3fcc30a)
+ + wincred: handle empty username/password correctly
+ + t0302: check helper can handle empty credentials
MinGW updates.
- Will merge to 'next'.
+ Will merge to 'master'.
* bw/diff-opt-impl-to-bitfields (2017-11-01) 8 commits
- - diff: make struct diff_flags members lowercase
- - diff: remove DIFF_OPT_CLR macro
- - diff: remove DIFF_OPT_SET macro
- - diff: remove DIFF_OPT_TST macro
- - diff: remove touched flags
- - diff: add flag to indicate textconv was set via cmdline
- - diff: convert flags to be stored in bitfields
- - add, reset: use DIFF_OPT_SET macro to set a diff flag
+ (merged to 'next' on 2017-11-07 at 8be78206ba)
+ + diff: make struct diff_flags members lowercase
+ + diff: remove DIFF_OPT_CLR macro
+ + diff: remove DIFF_OPT_SET macro
+ + diff: remove DIFF_OPT_TST macro
+ + diff: remove touched flags
+ + diff: add flag to indicate textconv was set via cmdline
+ + diff: convert flags to be stored in bitfields
+ + add, reset: use DIFF_OPT_SET macro to set a diff flag
A single-word "unsigned flags" in the diff options is being split
into a structure with many bitfields.
- Will merge to 'next'.
+ Will merge to 'master'.
* mh/tidy-ref-update-flags (2017-11-06) 10 commits
* ao/diff-populate-filespec-lstat-errorpath-fix (2017-10-29) 1 commit
- - diff: fix lstat() error handling in diff_populate_filespec()
+ (merged to 'next' on 2017-11-07 at b03241e6e5)
+ + diff: fix lstat() error handling in diff_populate_filespec()
After an error from lstat(), diff_populate_filespec() function
sometimes still went ahead and used invalid data in struct stat,
which has been fixed.
- Will merge to 'next'.
+ Will merge to 'master'.
* av/fsmonitor (2017-11-01) 4 commits
- - fsmonitor: delay updating state until after split index is merged
- - fsmonitor: document GIT_TRACE_FSMONITOR
- - fsmonitor: don't bother pretty-printing JSON from watchman
- - fsmonitor: set the PWD to the top of the working tree
+ (merged to 'next' on 2017-11-07 at a06178754d)
+ + fsmonitor: delay updating state until after split index is merged
+ + fsmonitor: document GIT_TRACE_FSMONITOR
+ + fsmonitor: don't bother pretty-printing JSON from watchman
+ + fsmonitor: set the PWD to the top of the working tree
(this branch uses bp/fsmonitor.)
Various fixes to bp/fsmonitor topic.
- Will merge to 'next'.
+ Will merge to 'master'.
* bc/submitting-patches-in-asciidoc (2017-10-30) 2 commits
cf. <0102015f5e5ee171-f30f4868-886f-47a1-a4e4-b4936afc545d-000000@eu-west-1.amazonses.com>
-* jc/ignore-cr-at-eol (2017-10-27) 2 commits
+* jc/ignore-cr-at-eol (2017-11-08) 2 commits
- diff: --ignore-cr-at-eol
- xdiff: reassign xpparm_t.flags bits
The "diff" family of commands learned to ignore differences in
carriage return at the end of line.
- Just a lunch-time hack.
- Lacks tests, docs and proper log message.
-
* mh/avoid-rewriting-packed-refs (2017-10-30) 2 commits
- files-backend: don't rewrite the `packed-refs` file unnecessarily
Will merge to 'next'.
-* cc/git-packet-pm (2017-10-31) 7 commits
- - fixup! Git/Packet.pm: extract parts of t0021/rot13-filter.pl for reuse
+* cc/git-packet-pm (2017-11-07) 8 commits
- Git/Packet.pm: extract parts of t0021/rot13-filter.pl for reuse
- t0021/rot13-filter: add capability functions
+ - t0021/rot13-filter: refactor checking final lf
- t0021/rot13-filter: add packet_initialize()
- t0021/rot13-filter: improve error message
- t0021/rot13-filter: improve 'if .. elsif .. else' style
- t0021/rot13-filter: refactor packet reading functions
+ - t0021/rot13-filter: fix list comparison
Parts of a test to drive the long-running content filter interface
has been split into its own module, hopefully to eventually become
reusable.
- Reroll posted but not picked up yet.
- cf. <20171105213836.11717-1-chriscool@tuxfamily.org>
+ Will merge to 'next'.
* jm/status-ignored-files-list (2017-10-31) 4 commits
- (merged to 'next' on 2017-11-01 at fe51978a30)
+ (merged to 'next' on 2017-11-07 at 682c74a2cb)
+ status: test ignored modes
+ status: document options to show matching ignored files
+ status: report matching ignored and normal untracked
+ status: add option to show ignored files differently
+ Originally merged to 'next' on 2017-11-01
+
The set of paths output from "git status --ignored" was tied
closely with its "--untracked=<mode>" option, but now it can be
controlled more flexibly. Most notably, a directory that is
* jc/branch-name-sanity (2017-10-14) 3 commits
- (merged to 'next' on 2017-10-16 at 174646d1c3)
- + branch: forbid refs/heads/HEAD
- + branch: split validate_new_branchname() into two
- + branch: streamline "attr_only" handling in validate_new_branchname()
+ - branch: forbid refs/heads/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".
- Will kick back to 'pu'.
+ Reported to cause problems when renaming HEAD during a rebase.
+ cf. <49563f7c-354e-334e-03a6-c3a40884b6d0@gmail.com>
* ot/mru-on-list (2017-10-01) 1 commit
- (merged to 'next' on 2017-10-07 at e6ad4a16a2)
- + mru: use double-linked list from list.h
+ - mru: use double-linked list from list.h
The first step to getting rid of mru API and using the
doubly-linked list API directly instead.
* bp/fsmonitor (2017-10-05) 15 commits
- (merged to 'next' on 2017-10-05 at 964a029d13)
+ (merged to 'next' on 2017-11-07 at b08d44ba60)
+ fsmonitor: preserve utf8 filenames in fsmonitor-watchman log
+ fsmonitor: read entirety of watchman output
+ fsmonitor: MINGW support for watchman integration
- (merged to 'next' on 2017-10-02 at cf0c67979c)
+ fsmonitor: add a performance test
+ fsmonitor: add a sample integration script for Watchman
+ fsmonitor: add test cases for fsmonitor extension
+ bswap: add 64 bit endianness helper get_be64
(this branch is used by av/fsmonitor.)
+ Originally merged to 'next' on 2017-10-05
+
We learned to talk to watchman to speed up "git status" and other
operations that need to see which paths have been modified.
- Waiting for av/fsmonitor topic.
+ Will merge to 'master'.
* bw/protocol-v1 (2017-10-17) 11 commits
- (merged to 'next' on 2017-10-18 at 835fe09e50)
- + Documentation: document Extra Parameters
- + ssh: introduce a 'simple' ssh variant
- + i5700: add interop test for protocol transition
- + http: tell server that the client understands v1
- + connect: tell server that the client understands v1
- + connect: teach client to recognize v1 server response
- + upload-pack, receive-pack: introduce protocol version 1
- + daemon: recognize hidden request arguments
- + protocol: introduce protocol extension mechanisms
- + pkt-line: add packet_write function
- + connect: in ref advertisement, shallows are last
+ - Documentation: document Extra Parameters
+ - ssh: introduce a 'simple' ssh variant
+ - i5700: add interop test for protocol transition
+ - http: tell server that the client understands v1
+ - connect: tell server that the client understands v1
+ - connect: teach client to recognize v1 server response
+ - upload-pack, receive-pack: introduce protocol version 1
+ - daemon: recognize hidden request arguments
+ - protocol: introduce protocol extension mechanisms
+ - pkt-line: add packet_write function
+ - connect: in ref advertisement, shallows are last
(this branch is used by jn/ssh-wrappers.)
A new mechanism to upgrade the wire protocol in place is proposed
* sb/submodule-recursive-checkout-detach-head (2017-07-28) 2 commits
- (merged to 'next' on 2017-10-26 at 30994b4c76)
- + Documentation/checkout: clarify submodule HEADs to be detached
- + recursive submodules: detach HEAD from new state
+ - Documentation/checkout: clarify submodule HEADs to be detached
+ - recursive submodules: detach HEAD from new state
"git checkout --recursive" may overwrite and rewind the history of
the branch that happens to be checked out in submodule
repositories, which might not be desirable. Detach the HEAD but
still allow the recursive checkout to succeed in such a case.
- Undecided.
- This needs justification in a larger picture; it is unclear why
- this is better than rejecting recursive checkout, for example.
+ Expecting a reroll.
--------------------------------------------------
[Discarded]
* jk/ui-color-always-to-auto-maint (2017-10-13) 2 commits
- (merged to 'next' on 2017-10-13 at bb16e1edc8)
- + color: document that "git -c color.*=always" is a bit special
- + color: downgrade "always" to "auto" only for on-disk configuration
+ . color: document that "git -c color.*=always" is a bit special
+ . color: downgrade "always" to "auto" only for on-disk configuration
It turns out that "git -c color.ui=always cmd" is relied on by many
third-party tools as a way to force coloured output no matter what
* jh/dir-add-exclude-from-blob (2017-10-27) 1 commit
- - dir: allow exclusions from blob in addition to file
+ . dir: allow exclusions from blob in addition to file
The code to read exclusion list from a blob, which is used when the
.gitignore file is outside a sparse checkout area, has been
projects / thirdparty / git.git / commitdiff
