Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-16 Thread Stefan Beller
On Tue, Oct 16, 2018 at 6:39 AM Phillip Wood wrote: > > If you mean "--color-moved-ws=no" (or "--no-color-moved-ws") as a > > way to countermand an earlier --color-moved-ws= on the > > command line, I fully agree that it is a good idea. > > Oh I assumed --no-color-moved-ws was allowed but it

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-16 Thread Phillip Wood
On 12/10/2018 14:36, Junio C Hamano wrote: Phillip Wood writes: It would be nice if the parsing used starts_with(option_name, user_text) rather than strcmp() as well. Also I think --color-moved=no is valid as a synonym of --no-color-moved but --color-moved-ws=no is not supported. I am not

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-14 Thread Duy Nguyen
On Wed, Oct 10, 2018 at 7:43 AM Junio C Hamano wrote: > * nd/per-worktree-ref-iteration (2018-10-07) 9 commits > - SQUASH??? > - reflog expire: cover reflog from all worktrees > - fsck: check HEAD and reflog from other worktrees > - fsck: Move fsck_head_link() to get_default_heads() to avoid

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-12 Thread Junio C Hamano
Phillip Wood writes: > It would be nice if the parsing used starts_with(option_name, user_text) > rather than strcmp() as well. Also I think --color-moved=no is valid as > a synonym of --no-color-moved but --color-moved-ws=no is not supported. I am not sure about starts_with(). Do you mean we

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-12 Thread Phillip Wood
On 11/10/2018 23:40, Junio C Hamano wrote: > Phillip Wood writes: > >> On 10/10/2018 06:43, 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

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-11 Thread Junio C Hamano
Stefan Beller writes: > I think we should add these tweaks, such that > color-moved-ws implies color-moved (both config and CLI options) > and --color-moved implies --color (command line only) I am not sure what you mean by "both config and". I'd find it entirely sensible for a user to say "I

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-11 Thread Stefan Beller
On Thu, Oct 11, 2018 at 3:41 PM Junio C Hamano wrote: > * After fixing ignore-any to one of the supported option >(e.g. "ignore-all-spaces"), the color-moved feature still did not >trigger. I think the presence of --color-moved-ws by itself is a >hint that the user wants

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-11 Thread Junio C Hamano
Phillip Wood writes: > On 10/10/2018 06:43, 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

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-11 Thread Derrick Stolee
On 10/10/2018 1:43 AM, Junio C Hamano wrote: * ds/reachable-topo-order (2018-09-21) 7 commits - revision.c: refactor basic topo-order logic - revision.h: add whitespace in flag definitions - commit/revisions: bookkeeping before refactoring - revision.c: begin refactoring --topo-order

Re: builtin stash/rebase, was Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-10 Thread Junio C Hamano
Johannes Schindelin writes: > https://github.com/git-for-windows/git/commit/6bc7024aecdb1aeb2760c519f7b26e6e5ef21051 > fixup! builtin rebase: support `-C` and `--whitespace=` For c7ee2134d4 (rebase-in-c-4-opts); a single liner that is obviously correct. >

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-10 Thread Junio C Hamano
Stefan Beller writes: >> * pw/diff-color-moved-ws-fix (2018-10-04) 5 commits > I would suggest merging to 'next'. OK. >> * sb/strbuf-h-update (2018-09-29) 1 commit > The patch as-is just adds names everywhere. > I'd be happy to resend with either > (a) not enforcing names everywhere, but only

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-10 Thread Junio C Hamano
Phillip Wood writes: > On 10/10/2018 06:43, 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

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-10 Thread Junio C Hamano
Johannes Sixt writes: > Am 10.10.18 um 07:43 schrieb Junio C Hamano: >> We haven't seen much complaints and breakages reported against the >> two big "rewrite in C" topics around "rebase"; perhaps it is a good >> time to merge them to 'next' soonish to cook them for a few weeks >> before moving

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-10 Thread Junio C Hamano
Thomas Gummerer writes: > There was a v9 of this series [*1*], which hasn't been picked up yet. > Was that intentional, or an oversight? ;-) Yes, I often miss patches that are buried in other discussions, but this time, it was quite deliberate. I saw comments that pointed out at least one

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-10 Thread Johannes Sixt
Am 10.10.18 um 07:43 schrieb Junio C Hamano: We haven't seen much complaints and breakages reported against the two big "rewrite in C" topics around "rebase"; perhaps it is a good time to merge them to 'next' soonish to cook them for a few weeks before moving them to 'master'? Please let me

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-10 Thread Tim Schumacher
On 10.10.18 07:43, Junio C Hamano wrote: * ts/alias-of-alias (2018-09-17) 3 commits (merged to 'next' on 2018-10-09 at ac19b4730b) + t0014: introduce an alias testing suite + alias: show the call history when an alias is looping + alias: add support for aliases of an alias An alias

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-10 Thread Stefan Beller
> * pw/diff-color-moved-ws-fix (2018-10-04) 5 commits > - diff --color-moved: fix a memory leak > - diff --color-moved-ws: fix another memory leak > - diff --color-moved-ws: fix a memory leak > - diff --color-moved-ws: fix out of bounds string access > - diff --color-moved-ws: fix double free

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-10 Thread Jeff King
On Wed, Oct 10, 2018 at 09:59:16AM +0200, Ævar Arnfjörð Bjarmason wrote: > > On Wed, Oct 10 2018, Junio C Hamano wrote: > > > * 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

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-10 Thread Thomas Gummerer
On 10/10, Junio C Hamano wrote: > * ps/stash-in-c (2018-08-31) 20 commits > - stash: replace all `write-tree` child processes with API calls > - stash: optimize `get_untracked_files()` and `check_changes()` > - stash: convert `stash--helper.c` into `stash.c` > - stash: convert save to builtin

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-10 Thread Phillip Wood
On 10/10/2018 06:43, 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: builtin stash/rebase, was Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-10 Thread Junio C Hamano
Johannes Schindelin writes: > Speaking about the two `rebase` ones: they are simple fixup! commits, > could I trouble you to fetch and cherry-pick them into `pu`, or would you > prefer if I sent another iteration of `rebase-in-c-4-opts`? If it were only about me, then the former if I can do my

Re: js/mingw-wants-vista-or-above, was Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-10 Thread Junio C Hamano
Johannes Schindelin writes: > Hi Junio, > > On Wed, 10 Oct 2018, Junio C Hamano wrote: > >> * js/mingw-wants-vista-or-above (2018-10-04) 3 commits >> - mingw: bump the minimum Windows version to Vista >> - mingw: set _WIN32_WINNT explicitly for Git for Windows >> - compat/poll: prepare for

js/mingw-wants-vista-or-above, was Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-10 Thread Johannes Schindelin
Hi Junio, On Wed, 10 Oct 2018, Junio C Hamano wrote: > * js/mingw-wants-vista-or-above (2018-10-04) 3 commits > - mingw: bump the minimum Windows version to Vista > - mingw: set _WIN32_WINNT explicitly for Git for Windows > - compat/poll: prepare for targeting Windows Vista > > The minimum

builtin stash/rebase, was Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-10 Thread Johannes Schindelin
Hi Junio, On Wed, 10 Oct 2018, Junio C Hamano wrote: > We haven't seen much complaints and breakages reported against the > two big "rewrite in C" topics around "rebase"; perhaps it is a good > time to merge them to 'next' soonish to cook them for a few weeks > before moving them to 'master'? I

Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-10 Thread Ævar Arnfjörð Bjarmason
On Wed, Oct 10 2018, Junio C Hamano wrote: > * 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

What's cooking in git.git (Oct 2018, #01; Wed, 10)

2018-10-09 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. We haven't seen much complaints