Re: What's cooking in git.git (Feb 2018, #02; Tue, 13)

2018-02-14 Thread Junio C Hamano
Elijah Newren writes: >> Rename detection logic in "diff" family that is used in "merge" has >> learned to guess when all of x/a, x/b and x/c have moved to z/a, >> z/b and z/c, it is likely that x/d added in the meantime would also >> want to move to z/d by taking the hint that the entire dir

Re: What's cooking in git.git (Feb 2018, #02; Tue, 13)

2018-02-14 Thread Elijah Newren
On Tue, Feb 13, 2018 at 5:51 PM, Junio C Hamano wrote: > * en/rename-directory-detection (2018-01-31) 31 commits > - merge-recursive: ensure we write updates for directory-renamed file > - merge-recursive: avoid spurious rename/rename conflict from dir renames > - directory rename detection: n

Re: What's cooking in git.git (Feb 2018, #02; Tue, 13)

2018-02-14 Thread Stefan Beller
On Wed, Feb 14, 2018 at 10:11 AM, Brandon Williams wrote: > On 02/13, Junio C Hamano wrote: >> >> * bw/c-plus-plus (2018-01-30) 37 commits >> - replace: rename 'new' variables >> - trailer: rename 'template' variables >> - tempfile: rename 'template' variables >> - wrapper: rename 'template' v

Re: What's cooking in git.git (Feb 2018, #02; Tue, 13)

2018-02-14 Thread Brandon Williams
On 02/13, Junio C Hamano wrote: > > * bw/c-plus-plus (2018-01-30) 37 commits > - replace: rename 'new' variables > - trailer: rename 'template' variables > - tempfile: rename 'template' variables > - wrapper: rename 'template' variables > - environment: rename 'namespace' variables > - diff:

Re: What's cooking in git.git (Feb 2018, #02; Tue, 13)

2018-02-14 Thread Derrick Stolee
On 2/14/2018 12:23 PM, Junio C Hamano wrote: Derrick Stolee writes: There have been a few "What's cooking" emails since I submitted v1 of "Serialized Git Commit Graph" and it has not appeared with a tracking branch. Is this a mistake, or is it something about the state of the review? The la

Re: What's cooking in git.git (Feb 2018, #02; Tue, 13)

2018-02-14 Thread Junio C Hamano
Derrick Stolee writes: > There have been a few "What's cooking" emails since I submitted v1 of > "Serialized Git Commit Graph" and it has not appeared with a tracking > branch. Is this a mistake, or is it something about the state of the > review? The latter. Once I pick up a topic and have it

Re: What's cooking in git.git (Feb 2018, #02; Tue, 13)

2018-02-14 Thread Junio C Hamano
Duy Nguyen writes: >> Will see another reroll. >> cf. > > Well, the next reroll would just drop 42/42, which may be easier for > you to do it yourself. I don't think I can work out what all > git-completion.bash needs to rewrite 42/42 in a couple days. OK, I agree that I should have read the

Re: What's cooking in git.git (Feb 2018, #02; Tue, 13)

2018-02-14 Thread Derrick Stolee
On 2/13/2018 8:51 PM, Junio C Hamano wrote: Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding

Re: What's cooking in git.git (Feb 2018, #02; Tue, 13)

2018-02-14 Thread Duy Nguyen
On Wed, Feb 14, 2018 at 8:51 AM, Junio C Hamano wrote: > * nd/parseopt-completion (2018-02-09) 42 commits > - git-completion.bash: add GIT_COMPLETION_OPTIONS=all config > - completion: use __gitcomp_builtin in _git_worktree > - completion: use __gitcomp_builtin in _git_tag > - completion: use

What's cooking in git.git (Feb 2018, #02; Tue, 13)

2018-02-13 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. You can find the changes described