Subject: What's cooking in git.git (Nov 2016, #04; Mon, 21)

X-master-at: 1310affe024fba407bff55dbe65cd6d670c8a32d

X-next-at: d50252334705fce146cd91a5045ecc87fd6ea92e

What's cooking in git.git (Nov 2016, #04; Mon, 21)

* jc/for-each-ref-head-segfault-fix (2016-11-18) 1 commit

(merged to 'next' on 2016-11-21 at 3c1f352316)

+ for-each-ref: do not segv with %(HEAD) on an unborn branch

Using a %(HEAD) placeholder in "for-each-ref --format=" option

caused the command to segfault when on an unborn branch.

Will cook in 'next'.

* js/prepare-sequencer (2016-11-21) 1 commit

(merged to 'next' on 2016-11-21 at 7cdf4ca421)

+ i18n: fix unmatched single quote in error message

Fix for an error message string.

Will merge to 'master'.

- rebase -i: handle core.commentChar=auto

- stripspace: respect repository config

- rebase -i: highlight problems with core.commentchar

"git rebase -i" did not work well with core.commentchar

configuration variable for two reasons, both of which have been

fixed.

Waiting for an ack for updates.

Hopefully we can merge this before 2.11 final, as one of the

breakages is a recent regression.

* jc/cache-tree-wip (2016-11-18) 4 commits

- cache-tree: freshen the tree object at the top level

- cache-tree: retire cache_tree_fully_valid() API function

- commit: remove redundant check for active_cache_changed

- freshen_object(): factor out a helper function

* jk/trailers-placeholder-in-pretty (2016-11-21) 2 commits

- ref-filter: add support to display trailers as part of contents

- pretty: add %(trailers) format for displaying trailers of a commit message

* jt/trailer-with-cruft (2016-11-21) 1 commit

- doc: mention user-configured trailers

* sb/submodule-intern-gitdir (2016-11-21) 3 commits

- submodule--helper: add intern-git-dir function

- test-lib-functions.sh: teach test_commit -C <dir>

- submodule: use absolute path for computing relative path connecting

--------------------------------------------------

[Graduated to "master"]

* jk/create-branch-remove-unused-param (2016-11-09) 1 commit

(merged to 'next' on 2016-11-16 at 621254c832)

+ create_branch: drop unused "head" parameter

Code clean-up.

* nd/worktree-lock (2016-11-13) 1 commit

(merged to 'next' on 2016-11-16 at 67b731de07)

+ git-worktree.txt: fix typo "to"/"two", and add comma

Typofix.

* dt/empty-submodule-in-merge (2016-11-17) 1 commit

- submodules: allow empty working-tree dirs in merge/cherry-pick

An empty directory in a working tree that can simply be nuked used

to interfere while merging or cherry-picking a change to create a

submodule directory there, which has been fixed..

Waiting for review.

* bw/grep-recurse-submodules (2016-11-18) 6 commits

- grep: search history of moved submodules

- grep: enable recurse-submodules to work on <tree> objects

- grep: optionally recurse into submodules

- grep: add submodules as a grep source type

- submodules: load gitmodules file from commit sha1

- submodules: add helper functions to determine presence of submodules

"git grep" learns to optionally recurse into submodules

Waiting for review.

* dt/smart-http-detect-server-going-away (2016-11-18) 2 commits

(merged to 'next' on 2016-11-21 at d502523347)

+ upload-pack: optionally allow fetching any sha1

+ remote-curl: don't hang when a server dies before any output

When the http server gives an incomplete response to a smart-http

rpc call, it could lead to client waiting for a full response that

will never come. Teach the client side to notice this condition

and abort the transfer.

An improvement counterproposal has failed.

cf. <20161114194049.mktpsvgdhex2f4zv@sigill.intra.peff.net>

Will cook in 'next'.

* mm/push-social-engineering-attack-doc (2016-11-14) 1 commit

(merged to 'next' on 2016-11-16 at b7c1b27563)

+ doc: mention transfer data leaks in more places

Doc update on fetching and pushing.

Will cook in 'next'.

* nd/worktree-move (2016-11-12) 11 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()

. copy.c: convert copy_file() to copy_dir_recursively()

. copy.c: style fix

. copy.c: convert bb_(p)error_msg to error(_errno)

. copy.c: delete unused code in copy_file()

. copy.c: import copy_file() from busybox

"git worktree" learned move and remove subcommands.

Waiting for a reroll.

Seems to break a test or two.

* jc/compression-config (2016-11-15) 1 commit

- compression: unify pack.compression configuration parsing

Compression setting for producing packfiles were spread across

three codepaths, one of which did not honor any configuration.

Unify these so that all of them honor core.compression and

pack.compression variables the same way.

Needs tests for pack-objects and fast-import.

* mm/gc-safety-doc (2016-11-16) 1 commit

(merged to 'next' on 2016-11-17 at fc0d225b6b)

+ git-gc.txt: expand discussion of races with other processes

Doc update.

Will cook in 'next'.

(merged to 'next' on 2016-11-21 at 1a599af962)

+ submodule_needs_pushing(): explain the behaviour when we cannot answer

+ batch check whether submodule needs pushing into one call

+ serialize collection of refs that contain submodule changes

+ serialize collection of changed submodules

Will cook in 'next'.

Waiting for a reroll.

Waiting for a reroll.

As we do not follow symbolic links when reading control files like

.gitignore and .gitattributes from the index, match the behaviour

and not follow symbolic links when reading them from the working

tree. This also tightens security a bit by not leaking contents of

an unrelated file in the error messages when it is pointed at by

one of these files that is a symbolic link.

Perhaps we want to cover .gitmodules too with the same mechanism?

What's the doneness of this topic?

What's the doneness of this topic?

Will discard.

This may not be needed, given that update-index has a similar

option.

Will discard.

The whole premise feels wrong.