Re: What's cooking in git.git (Apr 2019, #02; Wed, 10)

2019-04-13 Thread Junio C Hamano
Christian Couder writes: > I can send a new version where the top two commits have the following titles: > > - replace: peel tag when passing a tag first to --graft > - replace: peel tag when passing a tag as parent to --graft If/when there are other things that needs fixing in the series, t

Re: dl/warn-tagging-a-tag, was Re: What's cooking in git.git (Apr 2019, #02; Wed, 10)

2019-04-11 Thread Junio C Hamano
Johannes Schindelin writes: > For me, this does not work without this squashed in: > > -- snipsnap -- > diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh > index 33a1d70b434d..7767cb1fab64 100755 > --- a/t/t7004-tag.sh > +++ b/t/t7004-tag.sh > @@ -1688,7 +1688,7 @@ test_expect_success '--points-at fin

Re: What's cooking in git.git (Apr 2019, #02; Wed, 10)

2019-04-11 Thread Christian Couder
On Tue, Apr 9, 2019 at 8:08 PM Junio C Hamano wrote: > * cc/replace-graft-peel-tags (2019-04-01) 4 commits > - replace: fix --graft when passing a tag first > - replace: fix --graft when passing a tag as parent > - t6050: redirect expected error output to a file > - t6050: use test_line_count

jh/trace2-sid-fix, was Re: What's cooking in git.git (Apr 2019, #02; Wed, 10)

2019-04-10 Thread Johannes Schindelin
Hi Junio, On Wed, 10 Apr 2019, Junio C Hamano wrote: > * jh/trace2-sid-fix (2019-04-01) 7 commits > - trace2: make SIDs more unique > - trace2: clarify UTC datetime formatting > - trace2: report peak memory usage of the process > - trace2: use system config for default trace2 settings > - tr

Re: What's cooking in git.git (Apr 2019, #02; Wed, 10)

2019-04-10 Thread Johannes Schindelin
Hi Phillip, On Wed, 10 Apr 2019, Phillip Wood wrote: > On 09/04/2019 19:08, 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

Re: What's cooking in git.git (Apr 2019, #02; Wed, 10)

2019-04-10 Thread Johannes Schindelin
Hi, On Wed, 10 Apr 2019, Junio C Hamano wrote: > Thomas Gummerer writes: > > > On 04/10, Junio C Hamano wrote: > > > >> * tg/stash-in-c-show-default-to-p-fix (2019-03-21) 1 commit > >> (merged to 'next' on 2019-04-10 at 9489a31a36) > >> + stash: setup default diff output format if necessary >

dl/warn-tagging-a-tag, was Re: What's cooking in git.git (Apr 2019, #02; Wed, 10)

2019-04-10 Thread Johannes Schindelin
Hi Junio, On Wed, 10 Apr 2019, Junio C Hamano wrote: > * dl/warn-tagging-a-tag (2019-04-09) 2 commits > - tag: advise on nested tags > - tag: fix formatting > > "git tag" learned to give an advice suggesting it might be a > mistake when creating an annotated or signed tag that points at > an

nd/switch-and-restore, was Re: What's cooking in git.git (Apr 2019, #02; Wed, 10)

2019-04-10 Thread Johannes Schindelin
Hi Junio, On Wed, 10 Apr 2019, Junio C Hamano wrote: > * nd/switch-and-restore (2019-04-02) 39 commits > - doc: promote "git restore" > - completion: support restore > - SQUASH??? move -p test to 2071 from 2070 > - t: add tests for restore > - restore: support --patch > - restore: default t

Re: What's cooking in git.git (Apr 2019, #02; Wed, 10)

2019-04-10 Thread Thomas Gummerer
On 04/10, Junio C Hamano wrote: > Thomas Gummerer writes: > > > On 04/10, Junio C Hamano wrote: > > > >> * tg/stash-in-c-show-default-to-p-fix (2019-03-21) 1 commit > >> (merged to 'next' on 2019-04-10 at 9489a31a36) > >> + stash: setup default diff output format if necessary > >> (this branc

Re: What's cooking in git.git (Apr 2019, #02; Wed, 10)

2019-04-10 Thread Mazo, Andrey
> * am/p4-branches-excludes (2019-04-02) 8 commits > - git-p4: respect excluded paths when detecting branches > - git-p4: add failing test for "git-p4: respect excluded paths when > detecting branches" > - git-p4: don't exclude other files with same prefix > - git-p4: add failing test for "don

Re: What's cooking in git.git (Apr 2019, #02; Wed, 10)

2019-04-10 Thread Phillip Wood
On 09/04/2019 19:08, 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 o

Re: What's cooking in git.git (Apr 2019, #02; Wed, 10)

2019-04-09 Thread Junio C Hamano
Denton Liu writes: >> * dl/submodule-set-branch (2019-02-08) 3 commits >> ... >> Needs sign-off on the tip commit; other than that it seems OK to be in >> 'next'. > > This has been here for a while. Did you need my explicit sign-off for > this? If that's the case, here you go: > > Signed-off-b

Re: What's cooking in git.git (Apr 2019, #02; Wed, 10)

2019-04-09 Thread Junio C Hamano
Thomas Gummerer writes: > On 04/10, Junio C Hamano wrote: > >> * tg/stash-in-c-show-default-to-p-fix (2019-03-21) 1 commit >> (merged to 'next' on 2019-04-10 at 9489a31a36) >> + stash: setup default diff output format if necessary >> (this branch uses ps/stash-in-c; is tangled with js/stash-i

Re: What's cooking in git.git (Apr 2019, #02; Wed, 10)

2019-04-09 Thread Todd Zullinger
Hi, Junio C Hamano wrote: > * tz/doc-apostrophe-no-longer-needed (2019-04-08) 1 commit > - Documentation/git-show-branch: drop last use of {apostrophe} > > Doc formatting fix. > > Will merge to 'next'. > > > * tz/git-svn-doc-markup-fix (2019-04-08) 1 commit > - Documentation/git-svn: impro

Re: What's cooking in git.git (Apr 2019, #02; Wed, 10)

2019-04-09 Thread Thomas Gummerer
On 04/10, Junio C Hamano wrote: > * tg/stash-in-c-show-default-to-p-fix (2019-03-21) 1 commit > (merged to 'next' on 2019-04-10 at 9489a31a36) > + stash: setup default diff output format if necessary > (this branch uses ps/stash-in-c; is tangled with js/stash-in-c-pathspec-fix > and tb/stash-

Re: What's cooking in git.git (Apr 2019, #02; Wed, 10)

2019-04-09 Thread Denton Liu
Hi Junio, On Wed, Apr 10, 2019 at 03:08:09AM +0900, Junio C Hamano wrote: > * dl/submodule-set-branch (2019-02-08) 3 commits > - submodule: teach set-branch subcommand > - submodule--helper: teach config subcommand --unset > - git-submodule.txt: "--branch " option defaults to 'master' > > "gi

What's cooking in git.git (Apr 2019, #02; Wed, 10)

2019-04-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. Sorry for keeping a rather huge ba