Re: [RFC] cherry-pick notes to find out cherry-picks from the origin

2018-11-15 Thread Jeff King
On Wed, Oct 17, 2018 at 07:39:21AM -0700, Tejun Heo wrote: > A while ago, I proposed changes to name-rev and describe so that they > can identify the commits cherry-picked from the one which is being > shown. > > >

Re: approxidate woes

2018-11-15 Thread Jeff King
On Thu, Nov 15, 2018 at 09:48:54AM -0500, Jeff King wrote: > I don't think "48h" does what you expect either: > > $ t/helper/test-date approxidate now > now -> 2018-11-15 14:43:32 + > > $ t/helper/test-date approxidate 48h > 48h -> 2018-11-15 14:43:34 + > > $

Re: [PATCH v2 1/1] bundle: cleanup lock files on error

2018-11-15 Thread Duy Nguyen
On Thu, Nov 15, 2018 at 1:59 PM Johannes Schindelin wrote: > So yes, we are trying to unlink the `.lock` file, and as far as I can tell > that > `unlink()` call comes from the tempfile cleanup asked for by Martin. However, > as > we still have a handle open to that file, that call fails. > > I

Re: [PATCH v2 1/1] bundle: cleanup lock files on error

2018-11-15 Thread Jeff King
On Thu, Nov 15, 2018 at 01:57:45PM +0100, Johannes Schindelin wrote: > > I looked at the test to see if it would pass, but it is not even > > checking anything about lockfiles! It just checks that we exit 1 by > > returning up the callstack instead of calling die(). And of course it > > would not

Re: [PATCH] technical doc: add a design doc for the evolve command

2018-11-15 Thread Ævar Arnfjörð Bjarmason
On Thu, Nov 15 2018, sxe...@google.com wrote: > +Detailed design > +=== > +Obsolescence information is stored as a graph of meta-commits. A meta-commit > is > +a specially-formatted merge commit that describes how one commit was created > +from others. > + > +Meta-commits look like

Re: [PATCH v4] commit: add a commit.allowEmpty config variable

2018-11-15 Thread Johannes Schindelin
Hi Peff, On Thu, 15 Nov 2018, Jeff King wrote: > On Thu, Nov 15, 2018 at 09:40:38AM +0100, Johannes Schindelin wrote: > > > From @chucklu: > > > > > my user case is like this : > > > > > > When I want to cherr-pick commits from A to G (ABCDEFG), image C and E > > > are merge commits. Then I

Re: approxidate woes

2018-11-15 Thread Jeff King
On Thu, Nov 15, 2018 at 02:45:28PM +0100, Andreas Krey wrote: > I've now located why our backup repo shrinks every month: > > git gc --prune=2d > > doesn't do what I expected, and differs a lot from --prune=48h. Yeah, it understands "2 days", but not "d" as a unit. I don't think "48h" does

Re: [PATCH v2 1/1] bundle: cleanup lock files on error

2018-11-15 Thread Jeff King
On Thu, Nov 15, 2018 at 05:32:15PM +0100, Johannes Schindelin wrote: > I cannot claim that I wrapped my head around your explanation or your diff (I > am > busy trying to prepare Git for Windows' `master` for rebasing to v2.20.0-rc0), > but it does fix the problem. Thank you so much! > > The

approxidate woes

2018-11-15 Thread Andreas Krey
Hi everybody, I've now located why our backup repo shrinks every month: git gc --prune=2d doesn't do what I expected, and differs a lot from --prune=48h. The latter actually means 'older than two days', while the former is 'since the second day of this month, same time as now'. Even '2d

Re: [PATCH v2 1/1] bundle: cleanup lock files on error

2018-11-15 Thread Johannes Schindelin
Hi Peff, On Thu, 15 Nov 2018, Jeff King wrote: > On Thu, Nov 15, 2018 at 01:57:45PM +0100, Johannes Schindelin wrote: > > > > I looked at the test to see if it would pass, but it is not even > > > checking anything about lockfiles! It just checks that we exit 1 by > > > returning up the

Re: Confusing behavior with ignored submodules and `git commit -a`

2018-11-15 Thread Stefan Beller
> I have a git repository which contains a number of submodules that > refer to external repositories. Some of these repositories need to > patched in some way, so patches are stored alongside the submodules, > and are applied when building. This mostly works fine, but causes > submodules to show

Re: [PATCH 18/23] submodule: use submodule repos for object lookup

2018-11-15 Thread Stefan Beller
On Thu, Nov 15, 2018 at 11:54 AM Jonathan Tan wrote: > > > +/* > > + * Initialize 'out' based on the provided submodule path. > > + * > > + * Unlike repo_submodule_init, this tolerates submodules not present > > + * in .gitmodules. This function exists only to preserve historical > > behavior, >

insteadOf and git-request-pull output

2018-11-15 Thread Konstantin Ryabitsev
Hi, all: Looks like setting url.insteadOf rules alters the output of git-request-pull. I'm not sure that's the intended use of insteadOf, which is supposed to replace URLs for local use, not to expose them publicly (but I may be wrong). E.g.: $ git request-pull HEAD^

Re: insteadOf and git-request-pull output

2018-11-15 Thread Ævar Arnfjörð Bjarmason
On Thu, Nov 15 2018, Konstantin Ryabitsev wrote: > Hi, all: > > Looks like setting url.insteadOf rules alters the output of > git-request-pull. I'm not sure that's the intended use of insteadOf, > which is supposed to replace URLs for local use, not to expose them > publicly (but I may be

Re: insteadOf and git-request-pull output

2018-11-15 Thread Konstantin Ryabitsev
On Thu, Nov 15, 2018 at 07:54:32PM +0100, Ævar Arnfjörð Bjarmason wrote: > > I think that if we use the "principle of least surprise," insteadOf > > rules shouldn't be applied for git-request-pull URLs. > > I haven't used request-pull so I don't have much of an opinion on this, > but do you think

Re: [PATCH 18/23] submodule: use submodule repos for object lookup

2018-11-15 Thread Jonathan Tan
> +/* > + * Initialize 'out' based on the provided submodule path. > + * > + * Unlike repo_submodule_init, this tolerates submodules not present > + * in .gitmodules. This function exists only to preserve historical behavior, > + * > + * Returns 0 on success, -1 when the submodule is not present.

Re: [PATCH v2 1/1] bundle: cleanup lock files on error

2018-11-15 Thread Johannes Schindelin
Hi Peff, On Thu, 15 Nov 2018, Jeff King wrote: > On Thu, Nov 15, 2018 at 05:32:15PM +0100, Johannes Schindelin wrote: > > > I cannot claim that I wrapped my head around your explanation or your > > diff (I am busy trying to prepare Git for Windows' `master` for > > rebasing to v2.20.0-rc0), but

Re: Confusing behavior with ignored submodules and `git commit -a`

2018-11-15 Thread Michael Forney
On 2018-11-15, Stefan Beller wrote: > On Wed, Nov 14, 2018 at 10:05 PM Michael Forney > wrote: >> Looking at ff6f1f564c, I don't really see anything that might be >> related to git-add, git-reset, or git-diff, so I'm guessing that this >> only worked before because the submodule config wasn't

Re: [PATCH 1/1] mingw: replace an obsolete link with the superseding one

2018-11-15 Thread Johannes Sixt
Am 15.11.18 um 12:22 schrieb Johannes Schindelin via GitGitGadget: From: Johannes Schindelin The MSDN documentation has been superseded by Microsoft Docs (which is backed by a repository on GitHub containing many, many files in Markdown format). Signed-off-by: Johannes Schindelin ---

Re: Confusing behavior with ignored submodules and `git commit -a`

2018-11-15 Thread Stefan Beller
On Wed, Nov 14, 2018 at 10:05 PM Michael Forney wrote: > > +bmwill > > On 2018-11-14, Michael Forney wrote: > > On 2018-10-25, Stefan Beller wrote: > >> I guess reverting that commit is not a good idea now, as > >> I would expect something to break. > >> > >> Maybe looking through the series

Re: Confusing behavior with ignored submodules and `git commit -a`

2018-11-15 Thread Michael Forney
On 2018-11-15, Michael Forney wrote: > Here is a work-in-progress diff that seems to have the correct > behavior in all cases I tried. I was hoping that gmail wouldn't mess with the whitespace, but apparently it has, sorry about that. Let me try again. --- builtin/add.c | 1 - diff-lib.c|

Re: Confusing behavior with ignored submodules and `git commit -a`

2018-11-15 Thread Stefan Beller
On Thu, Nov 15, 2018 at 1:33 PM Michael Forney wrote: > > On 2018-11-15, Stefan Beller wrote: > > On Wed, Nov 14, 2018 at 10:05 PM Michael Forney > > wrote: > >> Looking at ff6f1f564c, I don't really see anything that might be > >> related to git-add, git-reset, or git-diff, so I'm guessing

Re: Confusing behavior with ignored submodules and `git commit -a`

2018-11-15 Thread Michael Forney
On 2018-11-15, Stefan Beller wrote: > On Thu, Nov 15, 2018 at 1:33 PM Michael Forney wrote: >> Well, currently the submodule config can be disabled in diff_flags by >> setting override_submodule_config=1. However, I'm thinking it may be >> simpler to selectively *enable* the submodule config in

Re: [PATCHv3 00/23] Bring more repository handles into our code base

2018-11-15 Thread Jonathan Tan
> Please have a look at the last 4 patches specifically as they were new in > the last iteration (but did not receive any comment), as they demonstrate > and fix a problem that is only exposed when using GIT_TEST_COMMIT_GRAPH=1 > for the test suite. Thanks. I only reviewed patches 18 and 20-23,

Re: [PATCH] remote-curl: die on server-side errors

2018-11-15 Thread Josh Steadmon
On 2018.11.14 02:00, Jeff King wrote: > On Tue, Nov 13, 2018 at 07:49:15PM -0500, Jeff King wrote: > > > Yes, the packet_read_line_buf() interface will both advance the buf > > pointer and decrement the length. So if we want to "peek", we have to > > do so with a copy (there's a peek function if

Re: [[PATCH v2] ] INSTALL: add macOS gettext and sdk header explanation to INSTALL

2018-11-15 Thread Eric Sunshine
On Thu, Nov 15, 2018 at 11:07 PM Junio C Hamano wrote: > yanke131...@gmail.com writes: > > * add macOS gettext explanation to get the i18n locale translation take > > effect in macOS, as the most polular way of gettext > > install in macOS, the gettext is not linked by default, this commit

Re: [PATCH 0/3] clone: respect configured fetch respecs during initial fetch

2018-11-15 Thread Junio C Hamano
Jeff King writes: > On Wed, Nov 14, 2018 at 11:46:17AM +0100, SZEDER Gábor wrote: > >> This patch series should have been marked as v6, but I chose to reset >> the counter, because: >> >> - v5 was sent out way over a year ago [1], and surely everybody has >> forgotten about it since then

Re: [PATCH v2 1/2] rebase doc: document rebase.useBuiltin

2018-11-15 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > The rebase.useBuiltin variable introduced in 55071ea248 ("rebase: > start implementing it as a builtin", 2018-08-07) was turned on by > default in 5541bd5b8f ("rebase: default to using the builtin rebase", > 2018-08-08), but had no documentation. I actually

Re: [[PATCH v2] ] INSTALL: add macOS gettext and sdk header explanation to INSTALL

2018-11-15 Thread Junio C Hamano
yanke131...@gmail.com writes: > Subject: Re: [[PATCH v2] ] INSTALL: add macOS gettext and sdk header > explanation to INSTALL The above should look more like Subject: [PATCH v2] INSTALL: add macOS ... > From: out0fmemory This line is to give information that records who the patch

Re: insteadOf and git-request-pull output

2018-11-15 Thread Junio C Hamano
Konstantin Ryabitsev writes: > On Thu, Nov 15, 2018 at 07:54:32PM +0100, Ævar Arnfjörð Bjarmason wrote: >> > I think that if we use the "principle of least surprise," insteadOf >> > rules shouldn't be applied for git-request-pull URLs. >> >> I haven't used request-pull so I don't have much of

Re: [PATCH] ref-filter: don't look for objects when outside of a repository

2018-11-15 Thread Junio C Hamano
Jeff King writes: > On Thu, Nov 15, 2018 at 04:38:44AM -0500, Jeff King wrote: > >> Is SOURCE_NONE a complete match for what we want? >> >> I see problems in both directions: >> >> - sorting by "objectname" works now, but it's marked with SOURCE_OBJ, >>and would be forbidden with your

Re: [PATCH v2 2/2] [Outreachy] stash: tolerate missing user identity

2018-11-15 Thread Junio C Hamano
Slavica Djukic writes: > git-stash.sh | 17 + > t/t3903-stash.sh | 2 +- > 2 files changed, 18 insertions(+), 1 deletion(-) > > diff --git a/git-stash.sh b/git-stash.sh > index 94793c1a9..789ce2f41 100755 > --- a/git-stash.sh > +++ b/git-stash.sh > @@ -55,6 +55,20 @@

Re: [PATCH v3 1/1] protocol: advertise multiple supported versions

2018-11-15 Thread Junio C Hamano
Josh Steadmon writes: >> What I was alludding to was a lot simpler, though. An advert string >> "version=0:version=1" from a client that prefers version 0 won't be >> !strcmp("version=0", advert) but seeing many strcmp() in the patch >> made me wonder. > > Ah I see. The strcmp()s against

Re: [RFC PATCH 1/2] commit: don't add scissors line if one exists

2018-11-15 Thread Junio C Hamano
Denton Liu writes: >> If the current invocation of "git commit" added a scissors line in >> the buffer to be edited already, and we are adding another one in >> this function, is it possible that the real problem that somebody >> else has called wt_status_add_cut_line() before this function is

Re: [PATCH v2 1/2] [Outreachy] t3903-stash: test without configured user.name and user.email

2018-11-15 Thread Junio C Hamano
Slavica Djukic writes: > +test_expect_failure 'stash works when user.name and user.email are not set' ' > + git reset && > + git var GIT_COMMITTER_IDENT >expected && All the other existing test pieces in this file calls the expected result "expect"; is there a reason why this patch

Re: [PATCH v2 1/2] [Outreachy] t3903-stash: test without configured user.name and user.email

2018-11-15 Thread Junio C Hamano
Junio C Hamano writes: > Now we start using use-config-only, so unsetting environment > variables will cause trouble when Git insists on having an > explicitly configured identities. Makes sense. > >> +( >> +sane_unset GIT_AUTHOR_NAME && >> +sane_unset

Re: [PATCH v2 1/2] [Outreachy] t3903-stash: test without configured user.name and user.email

2018-11-15 Thread Junio C Hamano
Junio C Hamano writes: > Slavica Djukic writes: > >> +test_expect_failure 'stash works when user.name and user.email are not set' >> ' >> +git reset && >> +git var GIT_COMMITTER_IDENT >expected && > ... > Anyway, we grab the committer ident we use by default during the > test with this

Re: [PATCH v4] commit: add a commit.allowEmpty config variable

2018-11-15 Thread Johannes Schindelin
Hi, On Wed, 14 Nov 2018, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > > > Agreed. I'm happy to see the test for-loop gone as I noted in > > https://public-inbox.org/git/87d0rm7zeo@evledraar.gmail.com/ but as > > noted in that v3 feedback the whole "why would anyone want this?"

Re: [PATCH] ref-filter: don't look for objects when outside of a repository

2018-11-15 Thread Jeff King
On Thu, Nov 15, 2018 at 04:38:44AM -0500, Jeff King wrote: > Is SOURCE_NONE a complete match for what we want? > > I see problems in both directions: > > - sorting by "objectname" works now, but it's marked with SOURCE_OBJ, >and would be forbidden with your patch. I'm actually not sure if

Re: [PATCH v4] commit: add a commit.allowEmpty config variable

2018-11-15 Thread Jeff King
On Thu, Nov 15, 2018 at 09:40:38AM +0100, Johannes Schindelin wrote: > From @chucklu: > > > my user case is like this : > > > > When I want to cherr-pick commits from A to G (ABCDEFG), image C and E > > are merge commits. Then I will get lots of popup like: > > > >The previous cherry-pick

Re: [PATCH] ref-filter: don't look for objects when outside of a repository

2018-11-15 Thread Jeff King
On Wed, Nov 14, 2018 at 01:27:25PM +0100, SZEDER Gábor wrote: > The command 'git ls-remote --sort=authordate ' segfaults when > run outside of a repository, ever since the introduction of its > '--sort' option in 1fb20dfd8e (ls-remote: create '--sort' option, > 2018-04-09). > > While in general

Re: [PATCH 2/3] clone: respect additional configured fetch refspecs during initial fetch

2018-11-15 Thread Jeff King
On Wed, Nov 14, 2018 at 11:46:19AM +0100, SZEDER Gábor wrote: > The initial fetch during a clone doesn't transfer refs matching > additional fetch refspecs given on the command line as configuration > variables, e.g. '-c remote.origin.fetch='. This contradicts > the documentation stating that

Re: [PATCH] INSTALL: add macOS gettext and sdk header explanation to INSTALL

2018-11-15 Thread yan ke
Thanks for review, I will summit a new patch soon to improve this. Jonathan Nieder 于2018年11月15日周四 上午11:05写道: > > Hi! > > yanke131...@gmail.com wrote: > > > From: out0fmemory > > > > --- > > INSTALL | 7 +++ > > 1 file changed, 7 insertions(+) > > Thanks for writing. A few bits of

Re: [PATCH 0/3] clone: respect configured fetch respecs during initial fetch

2018-11-15 Thread Jeff King
On Wed, Nov 14, 2018 at 11:46:17AM +0100, SZEDER Gábor wrote: > This patch series should have been marked as v6, but I chose to reset > the counter, because: > > - v5 was sent out way over a year ago [1], and surely everybody has > forgotten about it since then anyway. But more

Re: [PATCH 1/3] clone: use a more appropriate variable name for the default refspec

2018-11-15 Thread Jeff King
On Wed, Nov 14, 2018 at 11:46:18AM +0100, SZEDER Gábor wrote: > cmd_clone() declares two strbufs 'key' and 'value' on the same line, > suggesting that they are used to contruct a config variable's name and > value. However, this is not the case: 'key' is used to construct the > names of multiple

Re: [PATCH 3/3] Documentation/clone: document ignored configuration variables

2018-11-15 Thread Jeff King
On Wed, Nov 14, 2018 at 11:46:20AM +0100, SZEDER Gábor wrote: > Due to limitations in the current implementation, some configuration > variables specified via 'git clone -c var=val' (or 'git -c var=val > clone') are ignored during the initial fetch and checkout. > > Let the users know which

[PATCH 1/1] mingw: replace an obsolete link with the superseding one

2018-11-15 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin The MSDN documentation has been superseded by Microsoft Docs (which is backed by a repository on GitHub containing many, many files in Markdown format). Signed-off-by: Johannes Schindelin --- compat/mingw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

[PATCH 0/1] mingw: update a link to the official documentation

2018-11-15 Thread Johannes Schindelin via GitGitGadget
It is a pretty neat thing that the bulky MSDN documentation has been replaced by something a lot more open, something that can be updated via Pull Requests on GitHub. Let's link to this new documentation instead of the obsolete one. I know, it is really close to the code freeze leading up to Git

[[PATCH v2] ] INSTALL: add macOS gettext and sdk header explanation to INSTALL

2018-11-15 Thread yanke131415
From: out0fmemory * add macOS gettext explanation to get the i18n locale translation take effect in macOS, as the most polular way of gettext install in macOS, the gettext is not linked by default, this commit give a tip on this thing. * add macOS Command Line Tool sdk header explanation to

Re: [PATCH v2 2/2] rebase: Implement --merge via git-rebase--interactive

2018-11-15 Thread Johannes Schindelin
Hi Elijah, On Wed, 14 Nov 2018, Elijah Newren wrote: > On Mon, Nov 12, 2018 at 8:21 AM Johannes Schindelin > wrote: > > > t3425: topology linearization was inconsistent across flavors of rebase, > > > as already noted in a TODO comment in the testcase. This was not > > >

Re: [PATCH 2/5] tests: respect GIT_TEST_INSTALLED when initializing repositories

2018-11-15 Thread Johannes Schindelin
Hi Junio, On Wed, 14 Nov 2018, Jeff King wrote: > On Wed, Nov 14, 2018 at 02:16:37PM +0100, Johannes Schindelin wrote: > > > > Makes perfect sense. Shouldn't we be asking where the template > > > directory of the installed version is and using it instead of the > > > freshly built one, no? > >

Re: [PATCH v2 1/2] [Outreachy] t3903-stash: test without configured user.name and user.email

2018-11-15 Thread Johannes Schindelin
Hi Slavica, this looks very good to me. Just one grammar thing: On Wed, 14 Nov 2018, Slavica Djukic wrote: > Add test to document that stash fails if user.name and user.email > are not configured. > In the later commit, test will be updated to expect success. In a later commit [...]

Re: [PATCH 2/5] tests: respect GIT_TEST_INSTALLED when initializing repositories

2018-11-15 Thread Jeff King
On Thu, Nov 15, 2018 at 01:29:58PM +0100, Johannes Schindelin wrote: > > Do we actually care where the templates are? I thought the point was to > > override for the built Git to use the built templates instead of the > > installed one. For an installed Git, shouldn't we not be overriding the > >

Re: [PATCH] technical doc: add a design doc for the evolve command

2018-11-15 Thread Johannes Schindelin
Hi Stefan, On Wed, 14 Nov 2018, sxe...@google.com wrote: > From: Stefan Xenos > > This document describes what an obsolescence graph for > git would look like, the behavior of the evolve command, > and the changes planned for other commands. Thanks, this is a good discussion starter. >

Re: [PATCH v2 1/1] bundle: cleanup lock files on error

2018-11-15 Thread Johannes Schindelin
Hi Peff, On Wed, 14 Nov 2018, Jeff King wrote: > On Wed, Nov 14, 2018 at 02:08:48PM -0800, Stefan Beller wrote: > > > On Wed, Nov 14, 2018 at 1:43 PM Martin Ågren wrote: > > > > > > On Wed, 14 Nov 2018 at 16:26, Gaël Lhez via GitGitGadget > > > wrote: > > > > However, the `.lock` file was