Re: [PATCH 3/3] send-email: also pick up cc addresses from -by trailers

2018-10-16 Thread Rasmus Villemoes
On 2018-10-16 07:57, Junio C Hamano wrote: > Rasmus Villemoes writes: > >>> I wonder if it would make it easier to grok if we made the logic >>> inside out, i.e. >>> >>> if ($sc eq $sender) { >>> ... >>> } else { >>> if ($what =~ /^Signed-off-by$/i) { >>>

[PATCH v2 3/3] send-email: also pick up cc addresses from -by trailers

2018-10-16 Thread Rasmus Villemoes
When rerolling a patch series, including various Reviewed-by etc. that may have come in, it is quite convenient to have git-send-email automatically cc those people. So pick up any *-by lines, with a new suppression category 'misc-by', but special-case Signed-off-by, since that already has its own

[PATCH v2 2/3] send-email: only consider lines containing @ or <> for automatic Cc'ing

2018-10-16 Thread Rasmus Villemoes
While the address sanitizations routines do accept local addresses, that is almost never what is meant in a Cc or Signed-off-by trailer. Looking through all the signed-off-by lines in the linux kernel tree without a @, there are mostly two patterns: Either just a full name, or a full name followed

[PATCH v2 0/3] send-email: Also pick up cc addresses from -by trailers

2018-10-16 Thread Rasmus Villemoes
This series extends the logic in git-send-email so that addresses appearing in various *-by: trailers (e.g. Reviewed-by, Acked-by, Tested-by) are picked up and added to the Cc list, in addition to the current logic that picks up Cc: and Signed-off-by: lines. This deliberately only picks up -by tra

[PATCH v2 1/3] Documentation/git-send-email.txt: style fixes

2018-10-16 Thread Rasmus Villemoes
For consistency, add full stops in a few places and outdent a line by one space. Signed-off-by: Rasmus Villemoes --- Documentation/git-send-email.txt | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt in

Re: [PATCH 3/3] send-email: also pick up cc addresses from -by trailers

2018-10-16 Thread Junio C Hamano
Rasmus Villemoes writes: >> It may be surprising to existing users that >> the command now suddenly adds more addresses the user did not think >> would be added, but it would probably be easy enough for them to >> work around. > > Yeah, I thought about that, but unfortunately the whole auto-cc b

[PATCH 1/1] subtree: make install targets depend on build targets

2018-10-16 Thread Christian Hesse
From: Christian Hesse Now that we have build targets let the install targets depend on them. Also make the targets phony. Signed-off-by: Christian Hesse --- contrib/subtree/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/subtree/Makefile b/contrib/sub

Re: [PATCH v2 0/3] send-email: Also pick up cc addresses from -by trailers

2018-10-16 Thread Junio C Hamano
Rasmus Villemoes writes: > This series extends the logic in git-send-email so that addresses > appearing in various *-by: trailers (e.g. Reviewed-by, Acked-by, > Tested-by) are picked up and added to the Cc list, in addition to the > current logic that picks up Cc: and Signed-off-by: lines. Than

Re: [PATCH 1/1] subtree: make install targets depend on build targets

2018-10-16 Thread Junio C Hamano
Christian Hesse writes: > From: Christian Hesse > > Now that we have build targets let the install targets depend on them. > Also make the targets phony. > > Signed-off-by: Christian Hesse > --- > contrib/subtree/Makefile | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Thanks, w

Re: [PATCH v2 12/13] README: add a build badge (status of the Azure Pipelines build)

2018-10-16 Thread Johannes Schindelin
Hi Eric, On Mon, 15 Oct 2018, Eric Sunshine wrote: > On Mon, Oct 15, 2018 at 6:12 AM Johannes Schindelin via GitGitGadget > wrote: > > Just like so many other OSS projects, we now also have a build badge. > > > > Signed-off-by: Johannes Schindelin > > --- > > diff --git a/README.md b/README.md

Re: [PATCH v2 09/13] git-p4: use `test_atexit` to kill the daemon

2018-10-16 Thread Johannes Schindelin
Hi Eric, On Mon, 15 Oct 2018, Eric Sunshine wrote: > On Mon, Oct 15, 2018 at 6:12 AM Johannes Schindelin via GitGitGadget > wrote: > > This should be more reliable than the current method, and prepares the > > test suite for a consistent way to clean up before re-running the tests > > with diffe

Re: Ignored files being silently overwritten when switching branches

2018-10-16 Thread Ævar Arnfjörð Bjarmason
On Tue, Oct 16 2018, Jeff King wrote: > On Mon, Oct 15, 2018 at 01:01:50PM +, Per Lundberg wrote: > >> Sorry if this question has been asked before; I skimmed through the list >> archives and the FAQ but couldn't immediately find it - please point me >> in the right direction if it has indee

Re: [PATCH 0/9] Offer to run CI/PR builds in Visual Studio Team Services

2018-10-16 Thread Ævar Arnfjörð Bjarmason
On Tue, Oct 16, 2018 at 6:50 AM Junio C Hamano wrote: > > Johannes Schindelin writes: > > > AFAIR Junio does not push to github.com/git/git, it is an automatic > > mirror. > > > > GitLab could easily do the same. > > It used to be in the early days but these days git/git and > gitster/git are upd

Re: [PATCH v2 09/13] git-p4: use `test_atexit` to kill the daemon

2018-10-16 Thread Johannes Schindelin
Hi Luke, On Mon, 15 Oct 2018, Luke Diamand wrote: > On Mon, 15 Oct 2018 at 16:02, Johannes Schindelin > wrote: > > > > Hi Luke, > > > > On Mon, 15 Oct 2018, Luke Diamand wrote: > > > > > On Mon, 15 Oct 2018 at 11:12, Johannes Schindelin via GitGitGadget > > > wrote: > > > > > > > > From: Johann

Re: [PATCH v2 13/13] travis: fix skipping tagged releases

2018-10-16 Thread SZEDER Gábor
On Mon, Oct 15, 2018 at 03:12:17AM -0700, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > When building a PR, TRAVIS_BRANCH refers to the *target branch*. > Therefore, if a PR targets `master`, and `master` happened to be tagged, > we skipped the build by mistake. >

Re: [PATCH v2 05/13] ci/lib.sh: add support for Azure Pipelines

2018-10-16 Thread SZEDER Gábor
On Mon, Oct 15, 2018 at 03:12:05AM -0700, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > This patch introduces a conditional arm that defines some environment > variables and a function that displays the URL given the job id (to > identify previous runs for known-goo

Re: [PATCH v2 06/13] Add a build definition for Azure DevOps

2018-10-16 Thread Johannes Schindelin
Hi Junio, On Tue, 16 Oct 2018, Junio C Hamano wrote: > "Johannes Schindelin via GitGitGadget" > writes: > > > Also, we make use of the shiny new feature we just introduced where the > > test suite can output JUnit-style .xml files. This information is made > > available in a nice UI that allows

Re: [PATCH v2 10/13] tests: include detailed trace logs with --write-junit-xml upon failure

2018-10-16 Thread SZEDER Gábor
On Mon, Oct 15, 2018 at 03:12:12AM -0700, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > The JUnit XML format lends itself to be presented in a powerful UI, > where you can drill down to the information you are interested in very > quickly. > > For test failures, th

Re: [PATCH v10 00/21] Convert "git stash" to C builtin

2018-10-16 Thread Johannes Schindelin
Hi Thomas, On Mon, 15 Oct 2018, Thomas Gummerer wrote: > 2: 63f2e0e6f9 ! 2: 2d45985676 strbuf.c: add `strbuf_join_argv()` > @@ -14,19 +14,17 @@ > strbuf_setlen(sb, sb->len + sb2->len); > } > > -+const char *strbuf_join_argv(struct strbuf *buf, > -+

Re: [PATCH v2 00/13] Offer to run CI/PR builds in Azure Pipelines

2018-10-16 Thread SZEDER Gábor
On Mon, Oct 15, 2018 at 07:22:15AM -0700, Taylor Blau wrote: > Would we like to abandon Travis as our main CI service for upstream > git.git, and build on Azure Pipelines only? It's not only about "upstream git.git", but also about contributors, who might have enabled Travis CI integration on thei

I 'm Baker AKEMI From Japan

2018-10-16 Thread Akemi BAKER
-- Dear Partner. Please forgive me if my proposal come to you as an embarrassment as I had no previous correspondence with you before now, I got your email contact from Asian Business Directory. I am Akemi BAKER; I was born in 1987, from Fukushima, Japan. Unfortunately my parent died in m

Re: [PATCH 0/4] Bloom filter experiment

2018-10-16 Thread Derrick Stolee
On 10/16/2018 12:45 AM, Junio C Hamano wrote: Derrick Stolee writes: 2. The filters are sized according to the number of changes in each commit, with a minimum of one 64-bit word. ... 6. When we compute the Bloom filters, we don't store a filter for commits whose first-parent diff has more tha

Re: [PATCH v2 00/13] Offer to run CI/PR builds in Azure Pipelines

2018-10-16 Thread Ævar Arnfjörð Bjarmason
On Tue, Oct 16, 2018 at 4:55 AM Taylor Blau wrote: > > On Mon, Oct 15, 2018 at 04:55:25PM +0200, Johannes Schindelin wrote: > > Another really good reason for me to do this is that I can prod the Azure > > Pipelines team directly. And I even get an answer, usually within minutes. > > Which is a lo

Re: [PATCH 2/3] http: add support for disabling SSL revocation checks in cURL

2018-10-16 Thread Johannes Schindelin
Hi Eric, On Mon, 15 Oct 2018, Eric Sunshine wrote: > On Mon, Oct 15, 2018 at 6:14 AM Brendan Forster via GitGitGadget > wrote: > > This config value is only used if http.sslBackend is set to "schannel", > > which forces cURL to use the Windows Certificate Store when validating > > server certif

Re: [PATCH 2/3] http: add support for disabling SSL revocation checks in cURL

2018-10-16 Thread Johannes Schindelin
Hi Junio, On Tue, 16 Oct 2018, Junio C Hamano wrote: > "Brendan Forster via GitGitGadget" writes: > > > Note: an earlier iteration tried to use the config setting > > http.schannel.checkRevoke, but the http.* config settings can be limited > > to specific URLs via http..* (which would mistake `

Re: [PATCH 2/3] http: add support for disabling SSL revocation checks in cURL

2018-10-16 Thread Johannes Schindelin
Hi Peff, On Tue, 16 Oct 2018, Jeff King wrote: > On Tue, Oct 16, 2018 at 01:23:25PM +0900, Junio C Hamano wrote: > > > > +#if LIBCURL_VERSION_NUM >= 0x072c00 > > > + curl_easy_setopt(result, CURLOPT_SSL_OPTIONS, > > > CURLSSLOPT_NO_REVOKE); > > > +#else > > > + warning("CURLSSLO

Re: [PATCH 3/3] mingw: use domain information for default email

2018-10-16 Thread Johannes Schindelin
Hi Eric, On Mon, 15 Oct 2018, Eric Sunshine wrote: > On Mon, Oct 15, 2018 at 5:47 AM Johannes Schindelin via GitGitGadget > wrote: > > When a user is registered in a Windows domain, it is really easy to > > obtain the email address. So let's do that. > > [...] > > Signed-off-by: Johannes Schinde

Re: [PATCH 2/3] getpwuid(mingw): provide a better default for the user name

2018-10-16 Thread Johannes Schindelin
Hi Eric, On Mon, 15 Oct 2018, Eric Sunshine wrote: > On Mon, Oct 15, 2018 at 5:47 AM Johannes Schindelin via GitGitGadget > wrote: > > We do have the excellent GetUserInfoEx() function to obtain more > > detailed information of the current user (if the user is part of a > > Windows domain); Let'

Re: [PATCH 2/3] getpwuid(mingw): provide a better default for the user name

2018-10-16 Thread Eric Sunshine
On Tue, Oct 16, 2018 at 8:38 AM Johannes Schindelin wrote: > On Mon, 15 Oct 2018, Eric Sunshine wrote: > > On Mon, Oct 15, 2018 at 5:47 AM Johannes Schindelin via GitGitGadget > > wrote: > > > + len = ARRAY_SIZE(wbuffer); > > > + if (GetUserNameExW(type, wbuffer, &len)) { > > > +

Re: [PATCH v2 13/13] travis: fix skipping tagged releases

2018-10-16 Thread Johannes Schindelin
Hi Junio, On Tue, 16 Oct 2018, SZEDER Gábor wrote: > On Mon, Oct 15, 2018 at 03:12:17AM -0700, Johannes Schindelin via > GitGitGadget wrote: > > From: Johannes Schindelin > > > > When building a PR, TRAVIS_BRANCH refers to the *target branch*. > > Therefore, if a PR targets `master`, and `mast

Re: [PATCH v2 05/13] ci/lib.sh: add support for Azure Pipelines

2018-10-16 Thread Johannes Schindelin
Hi Gábor, On Tue, 16 Oct 2018, SZEDER Gábor wrote: > On Mon, Oct 15, 2018 at 03:12:05AM -0700, Johannes Schindelin via > GitGitGadget wrote: > > From: Johannes Schindelin > > > > This patch introduces a conditional arm that defines some environment > > variables and a function that displays th

Re: [PATCH 0/4] Bloom filter experiment

2018-10-16 Thread Ævar Arnfjörð Bjarmason
On Tue, Oct 16 2018, Derrick Stolee wrote: > On 10/16/2018 12:45 AM, Junio C Hamano wrote: >> Derrick Stolee writes: >> >>> 2. The filters are sized according to the number of changes in each >>> commit, with a minimum of one 64-bit word. >>> ... >>> 6. When we compute the Bloom filters, we don

Re: [PATCH v2 10/13] tests: include detailed trace logs with --write-junit-xml upon failure

2018-10-16 Thread Johannes Schindelin
Hi Gábor, On Tue, 16 Oct 2018, SZEDER Gábor wrote: > On Mon, Oct 15, 2018 at 03:12:12AM -0700, Johannes Schindelin via > GitGitGadget wrote: > > From: Johannes Schindelin > > > > The JUnit XML format lends itself to be presented in a powerful UI, > > where you can drill down to the information

Re: [PATCH 0/4] Bloom filter experiment

2018-10-16 Thread Derrick Stolee
On 10/16/2018 8:57 AM, Ævar Arnfjörð Bjarmason wrote: On Tue, Oct 16 2018, Derrick Stolee wrote: On 10/16/2018 12:45 AM, Junio C Hamano wrote: Derrick Stolee writes: 2. The filters are sized according to the number of changes in each commit, with a minimum of one 64-bit word. ... 6. When we

Re: [PATCH 2/3] getpwuid(mingw): provide a better default for the user name

2018-10-16 Thread Johannes Schindelin
Hi Eric, On Tue, 16 Oct 2018, Eric Sunshine wrote: > On Tue, Oct 16, 2018 at 8:38 AM Johannes Schindelin > wrote: > > On Mon, 15 Oct 2018, Eric Sunshine wrote: > > > On Mon, Oct 15, 2018 at 5:47 AM Johannes Schindelin via GitGitGadget > > > wrote: > > > > + len = ARRAY_SIZE(wbuffer); > >

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 su

Re: [PATCH] branch: trivial style fix

2018-10-16 Thread Tao Qingyun
>Sorry for the slow reply. For some reason I do not think your message >here made it to the list (but I don't see anything obviously wrong with >it). Yes, I cann't send message to the list using my email clinet, I don't know why. The only way I can make it is using `git send-email`(including this

[PATCH v2] branch: trivial style fix

2018-10-16 Thread Tao Qingyun
Signed-off-by: Tao Qingyun --- builtin/branch.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index c396c41533..0aa3dac27b 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -716,8 +716,7 @@ int cmd_branch(int argc, const char **arg

Re: [PATCH] branch: trivial style fix

2018-10-16 Thread Ævar Arnfjörð Bjarmason
On Tue, Oct 16, 2018 at 4:16 PM Tao Qingyun wrote: > > >Sorry for the slow reply. For some reason I do not think your message > >here made it to the list (but I don't see anything obviously wrong with > >it). > Yes, I cann't send message to the list using my email clinet, I don't > know why. The o

Urgent.

2018-10-16 Thread Mr Bello Benard
Dear Friend, My name is Mr Bello Benard, I am a lawyer by profession. I wish to offer you the next of kin to my client. You will inherit the sum of $4.6 million dollars my client left in the bank before his death. My client is a citizen of your country who died in auto crash with his wife and the

Re: [PATCH v2 10/13] Add a base implementation of SHA-256 support

2018-10-16 Thread Duy Nguyen
On Tue, Oct 16, 2018 at 1:31 AM brian m. carlson wrote: > > On Mon, Oct 15, 2018 at 04:59:12PM +0200, Duy Nguyen wrote: > > On Mon, Oct 15, 2018 at 4:23 AM brian m. carlson > > wrote: > > > > > > SHA-1 is weak and we need to transition to a new hash function. For > > > some time, we have referr

Re: [PATCH v12 0/8] filter: support for excluding all trees and blobs

2018-10-16 Thread Matthew DeVore
On Sun, Oct 14, 2018 at 8:43 PM Junio C Hamano wrote: > > Junio C Hamano writes: > > > Matthew DeVore writes: > > > >> Here is a re-roll-up since I haven't received any additional corrections > >> for > >> almost a week. > > > > Sorry, but doesn't this topic already sit in 'next'? If so, pleas

[PATCH v2] builtin/branch.c: remove useless branch_get

2018-10-16 Thread Tao Qingyun
branch_get sometimes returns current_branch, which can be NULL (e.g., if you're on a detached HEAD). Try: $ git branch HEAD fatal: no such branch 'HEAD' $ git branch '' fatal: no such branch '' However, it seems weird that we'd check those cases here (and provide such lousy messages). An

Re: Ignored files being silently overwritten when switching branches

2018-10-16 Thread Duy Nguyen
On Tue, Oct 16, 2018 at 11:12 AM Ævar Arnfjörð Bjarmason wrote: > > > On Tue, Oct 16 2018, Jeff King wrote: > > > On Mon, Oct 15, 2018 at 01:01:50PM +, Per Lundberg wrote: > > > >> Sorry if this question has been asked before; I skimmed through the list > >> archives and the FAQ but couldn't i

Re: [PATCH v2 01/13] sha1-file: rename algorithm to "sha1"

2018-10-16 Thread Duy Nguyen
On Mon, Oct 15, 2018 at 4:21 AM brian m. carlson wrote: > > The transition plan anticipates us using a syntax such as "^{sha1}" for > disambiguation. Since this is a syntax some people will be typing a > lot, it makes sense to provide a short, easy-to-type syntax. Omitting > the dash doesn't cre

Re: [PATCH 2/3] http: add support for disabling SSL revocation checks in cURL

2018-10-16 Thread Jeff King
On Tue, Oct 16, 2018 at 02:25:57PM +0200, Johannes Schindelin wrote: > > > That ">=" is hard to grok. I think you meant it to be pronounced > > > "requries at least", but that is not a common reading. People more > > > commonly pronounce it "is greater than or equal to". > > > > This seemed odd

Re: [PATCH] branch: trivial style fix

2018-10-16 Thread Jeff King
On Tue, Oct 16, 2018 at 04:27:44PM +0200, Ævar Arnfjörð Bjarmason wrote: > On Tue, Oct 16, 2018 at 4:16 PM Tao Qingyun wrote: > > > > >Sorry for the slow reply. For some reason I do not think your message > > >here made it to the list (but I don't see anything obviously wrong with > > >it). > > Y

Re: [PATCH v2] branch: trivial style fix

2018-10-16 Thread Jeff King
On Tue, Oct 16, 2018 at 10:19:20PM +0800, Tao Qingyun wrote: > Signed-off-by: Tao Qingyun > --- > builtin/branch.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/builtin/branch.c b/builtin/branch.c > index c396c41533..0aa3dac27b 100644 > --- a/builtin/branch.c > +++

Re: [PATCH v2 13/13] commit-graph: specify OID version for SHA-256

2018-10-16 Thread Duy Nguyen
On Mon, Oct 15, 2018 at 4:23 AM brian m. carlson wrote: > > Since the commit-graph code wants to serialize the hash algorithm into > the data store, specify a version number for each supported algorithm. > Note that we don't use the values of the constants themselves, as they > are internal and co

Re: [PATCH v2 12/13] hash: add an SHA-256 implementation using OpenSSL

2018-10-16 Thread Duy Nguyen
On Mon, Oct 15, 2018 at 4:22 AM brian m. carlson wrote: > > We already have OpenSSL routines available for SHA-1, so add routines > for SHA-256 as well. Since we have "hash-speed" tool now, it would be great to keep some numbers of these hash implementations in the commit message (and maybe sha1

Re: [PATCH v2 00/13] Base SHA-256 implementation

2018-10-16 Thread Duy Nguyen
On Mon, Oct 15, 2018 at 4:21 AM brian m. carlson wrote: > > This series provides an actual SHA-256 implementation and wires it up, > along with some housekeeping patches to make it suitable for testing. > > New in this version is a patch which reverts the change to limit hashcmp > to 20 bytes. I'

Re: [PATCH v2 04/13] cache: make hashcmp and hasheq work with larger hashes

2018-10-16 Thread Duy Nguyen
On Mon, Oct 15, 2018 at 4:21 AM brian m. carlson wrote: > diff --git a/cache.h b/cache.h > index a13d14ce0a..0b88c3a344 100644 > --- a/cache.h > +++ b/cache.h > @@ -1024,16 +1024,12 @@ extern const struct object_id null_oid; > static inline int hashcmp(const unsigned char *sha1, const unsigned ch

Re: [PATCH v2 13/13] commit-graph: specify OID version for SHA-256

2018-10-16 Thread Derrick Stolee
On 10/16/2018 11:35 AM, Duy Nguyen wrote: On Mon, Oct 15, 2018 at 4:23 AM brian m. carlson wrote: Since the commit-graph code wants to serialize the hash algorithm into the data store, specify a version number for each supported algorithm. Note that we don't use the values of the constants them

Re: [PATCH v2 10/13] tests: include detailed trace logs with --write-junit-xml upon failure

2018-10-16 Thread SZEDER Gábor
On Tue, Oct 16, 2018 at 03:02:38PM +0200, Johannes Schindelin wrote: > Hi Gábor, > > On Tue, 16 Oct 2018, SZEDER Gábor wrote: > > > On Mon, Oct 15, 2018 at 03:12:12AM -0700, Johannes Schindelin via > > GitGitGadget wrote: > > > From: Johannes Schindelin > > > > > > The JUnit XML format lends i

Re: [PATCH v2 13/13] commit-graph: specify OID version for SHA-256

2018-10-16 Thread Duy Nguyen
On Tue, Oct 16, 2018 at 6:01 PM Derrick Stolee wrote: > > On 10/16/2018 11:35 AM, Duy Nguyen wrote: > > On Mon, Oct 15, 2018 at 4:23 AM brian m. carlson > > wrote: > >> Since the commit-graph code wants to serialize the hash algorithm into > >> the data store, specify a version number for each su

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 isn't

[PATCH] submodule helper: convert relative URL to absolute URL if needed

2018-10-16 Thread Stefan Beller
The submodule helper update_clone called by "git submodule update", clones submodules if needed. As submodules used to have the URL indicating if they were active, the step to resolve relative URLs was done in the "submodule init" step. Nowadays submodules can be configured active without calling a

Re: [PATCH v4 9/9] Documentation/config: add odb..promisorRemote

2018-10-16 Thread Jonathan Nieder
Hi Christian, On Tue, Sep 25, 2018, Christian Couder wrote: > In the cover letter there is a "Discussion" section which is about > this, but I agree that it might not be very clear. > > The main issue that this patch series tries to solve is that > extensions.partialclone config option limits the

Re: [PATCH 2/4] merge-recursive: increase marker length with depth of recursion

2018-10-16 Thread Elijah Newren
On Mon, Oct 15, 2018 at 7:17 PM Junio C Hamano wrote: > > Elijah Newren writes: > > > Would you like me to edit the commit message to include this more > > difficult case? > > Neither. If the "marker length" change is required in a separate > series that will build on top of the current 4-patch

[PATCH 1/9] sha1-array: provide oid_array_filter

2018-10-16 Thread Stefan Beller
Helped-by: Junio C Hamano Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- Documentation/technical/api-oid-array.txt | 5 + sha1-array.c | 17 + sha1-array.h | 3 +++ 3 files changed, 25 insertions(+)

[PATCH 4/9] submodule.c: move global changed_submodule_names into fetch submodule struct

2018-10-16 Thread Stefan Beller
The `changed_submodule_names` are only used for fetching, so let's make it part of the struct that is passed around for fetching submodules. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- submodule.c | 42 +++--- 1 file changed, 23 insertions(

[PATCH 5/9] submodule.c: do not copy around submodule list

2018-10-16 Thread Stefan Beller
'calculate_changed_submodule_paths' uses a local list to compute the changed submodules, and then produces the result by copying appropriate items into the result list. Instead use the result list directly and prune items afterwards using string_list_remove_empty_items. By doing so we'll have acc

[PATCH 6/9] repository: repo_submodule_init to take a submodule struct

2018-10-16 Thread Stefan Beller
When constructing a struct repository for a submodule for some revision of the superproject where the submodule is not contained in the index, it may not be present in the working tree currently either. In that siutation giving a 'path' argument is not useful. Upgrade the repo_submodule_init functi

[PATCH 8/9] fetch: retry fetching submodules if needed objects were not fetched

2018-10-16 Thread Stefan Beller
Currently when git-fetch is asked to recurse into submodules, it dispatches a plain "git-fetch -C " (with some submodule related options such as prefix and recusing strategy, but) without any information of the remote or the tip that should be fetched. This works surprisingly well in some workflow

[PATCH 9/9] builtin/fetch: check for submodule updates for non branch fetches

2018-10-16 Thread Stefan Beller
Gerrit, the code review tool, has a different workflow than our mailing list based approach. Usually users upload changes to a Gerrit server and continuous integration and testing happens by bots. Sometimes however a user wants to checkout a change locally and look at it locally. For this use case,

[PATCH 0/9] Resending sb/submodule-recursive-fetch-gets-the-tip

2018-10-16 Thread Stefan Beller
This is based on ao/submodule-wo-gitmodules-checked-out. This resends origin/sb/submodule-recursive-fetch-gets-the-tip, resolving the issues pointed out via origin/xxx/sb-submodule-recursive-fetch-gets-the-tip-in-pu by basing this series on origin/ao/submodule-wo-gitmodules-checked-out A range-d

[PATCH 2/9] submodule.c: fix indentation

2018-10-16 Thread Stefan Beller
The submodule subsystem is really bad at staying within 80 characters. Fix it while we are here. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- submodule.c | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/submodule.c b/submodule.c index 2b7082b2db..e1

[PATCH 3/9] submodule.c: sort changed_submodule_names before searching it

2018-10-16 Thread Stefan Beller
We can string_list_insert() to maintain sorted-ness of the list as we find new items, or we can string_list_append() to build an unsorted list and sort it at the end just once. As we do not rely on the sortedness while building the list, we pick the "append and sort at the end" as it has better wo

[PATCH 7/9] submodule: fetch in submodules git directory instead of in worktree

2018-10-16 Thread Stefan Beller
This patch started as a refactoring to make 'get_next_submodule' more readable, but upon doing so, I realized that "git fetch" of the submodule actually doesn't need to be run in the submodules worktree. So let's run it in its git dir instead. That should pave the way towards fetching submodules t

On overriding make variables from the environment...

2018-10-16 Thread SZEDER Gábor
Our Makefile has lines like these: CFLAGS = -g -O2 -Wall CC = cc AR = ar SPATCH = spatch Note the use of '=', not '?='. This means that these variables can be overridden from the command line, i.e. 'make CC=gcc-X.Y' will build with that particular GCC version, but not from the environmen

receive.denyCurrentBranch=updateInstead updates working tree even when receive.denyNonFastForwards rejects push

2018-10-16 Thread Rajesh Madamanchi
Hi, I am looking to report the below behavior when seems incorrect to me when receive.denyCurrentBranch is set to updateInstead and receive.denyNonFastForwards is set to true. Below are the steps to reproduce the scenario. Please excuse my ignorance if I'm missing something fundamental. Step 1 - S

Re: [PATCH v2 06/13] Add a build definition for Azure DevOps

2018-10-16 Thread SZEDER Gábor
On Mon, Oct 15, 2018 at 03:12:06AM -0700, Johannes Schindelin via GitGitGadget wrote: > diff --git a/azure-pipelines.yml b/azure-pipelines.yml > new file mode 100644 > index 00..b5749121d2 > --- /dev/null > +++ b/azure-pipelines.yml > @@ -0,0 +1,319 @@ > +resources: > +- repo: self > + fe

Re: [PATCH 17/19] submodule: use submodule repos for object lookup

2018-10-16 Thread Stefan Beller
On Thu, Oct 11, 2018 at 3:41 PM Jonathan Tan wrote: > > > +/* > > + * Initialize 'out' based on the provided submodule path. > > + * > > + * Unlike repo_submodule_init, this tolerates submodules not present > > + * in .gitmodules. NEEDSWORK: The repo_submodule_init behavior is > > + * preferrable.

Re: [PATCH v10 00/21] Convert "git stash" to C builtin

2018-10-16 Thread Thomas Gummerer
On 10/16, Johannes Schindelin wrote: > Hi Thomas, > > On Mon, 15 Oct 2018, Thomas Gummerer wrote: > > > 2: 63f2e0e6f9 ! 2: 2d45985676 strbuf.c: add `strbuf_join_argv()` > > @@ -14,19 +14,17 @@ > > strbuf_setlen(sb, sb->len + sb2->len); > > } > > > > -+const ch

[PATCH v2 2/2] merge-recursive: avoid showing conflicts with merge branch before HEAD

2018-10-16 Thread Elijah Newren
We want to load unmerged entries from HEAD into the index at stage 2 and from MERGE_HEAD into stage 3. Similarly, folks expect merge conflicts to look like HEAD content from our side content from their side MERGE_HEAD not MERGE_HEAD

[PATCH v2 1/2] merge-recursive: improve auto-merging messages with path collisions

2018-10-16 Thread Elijah Newren
Each individual file involved in a rename could have also been modified on both sides of history, meaning it may need to have content merges. If two such files are renamed into the same location, then on top of the two natural auto-merging messages we also have to two-way merge the result, giving u

[PATCH v2 0/2] More merge cleanups

2018-10-16 Thread Elijah Newren
This series adds a few more cleanups on top of en/merge-cleanup. Changes since v1: - Removed two patches that will instead be included in a follow-on series, as suggested by Junio. - Incorporated commit message cleanups (capitalization and indents) made by Junio to the previous round.

problem with not being able to enforce git content filters

2018-10-16 Thread Stas Bekman
Hi, TL;DR Our open source project dev team has a continuous problem with git content filters, because developers don't always have them configured. We need a way for git to support content filters w/o using user's .gitconfig. Otherwise it leads to an inconsistent behavior and messed up git check

Re: [PATCH v2 10/13] tests: include detailed trace logs with --write-junit-xml upon failure

2018-10-16 Thread Johannes Schindelin
Hi Gábor, On Tue, 16 Oct 2018, SZEDER Gábor wrote: > On Tue, Oct 16, 2018 at 03:02:38PM +0200, Johannes Schindelin wrote: > > > So I would suggest to go forward with my proposed strategy for the > > moment, right up until the time when we have had the resources to fix > > t5570, for starters. >

[PATCH 0/3] Fix gc segfault

2018-10-16 Thread Jameson Miller via GitGitGadget
In 9ac3f0e (pack-objects: fix performance issues on packing large deltas, 2018-07-22), a mutex was introduced that is used to guard the call to set the delta size. This commit added code to initialize it, but at an incorrect spot: in init_threaded_search(), while the call to oe_set_delta_size() (an

[PATCH 2/3] pack-objects (mingw): demonstrate a segmentation fault with large deltas

2018-10-16 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin There is a problem in the way 9ac3f0e5b3e4 (pack-objects: fix performance issues on packing large deltas, 2018-07-22) initializes that mutex in the `packing_data` struct. The problem manifests in a segmentation fault on Windows, when a mutex (AKA critical section) is acc

[PATCH 3/3] pack-objects (mingw): initialize `packing_data` mutex in the correct spot

2018-10-16 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin In 9ac3f0e5b3e4 (pack-objects: fix performance issues on packing large deltas, 2018-07-22), a mutex was introduced that is used to guard the call to set the delta size. This commit even added code to initialize it, but at an incorrect spot: in `init_threaded_search()`, w

[PATCH 1/3] Fix typo 'detla' -> 'delta'

2018-10-16 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin Signed-off-by: Johannes Schindelin --- pack-objects.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pack-objects.h b/pack-objects.h index 2ca39cfcfe..86ee93feb4 100644 --- a/pack-objects.h +++ b/pack-objects.h @@ -377,7 +377,7 @@ static inline uns

Re: [PATCH] submodule helper: convert relative URL to absolute URL if needed

2018-10-16 Thread Jonathan Nieder
Stefan Beller wrote: > Reported-by: Jaewoong Jung > Signed-off-by: Stefan Beller > --- > builtin/submodule--helper.c | 51 - > t/t7400-submodule-basic.sh | 24 + > 2 files changed, 58 insertions(+), 17 deletions(-) Reviewed-by: Jonathan Nied

Re: problem with not being able to enforce git content filters

2018-10-16 Thread Ævar Arnfjörð Bjarmason
On Tue, Oct 16 2018, Stas Bekman wrote: > When a person has a stripped out notebook checked out, when another > person commits un-stripped out notebook, it leads to: invalid `git > status` reports, `git pull` breaks, `git stash` doesn't work, since it > tries to stash using the filters, and `git

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

2018-10-16 Thread Josh Steadmon
On 2018.10.12 23:53, Junio C Hamano wrote: > * js/remote-archive-v2 (2018-09-28) 4 commits > (merged to 'next' on 2018-10-12 at 5f34377f60) > + archive: allow archive over HTTP(S) with proto v2 > + archive: implement protocol v2 archive command > + archive: use packet_reader for communications

[RFC] revision: Add --sticky-default option

2018-10-16 Thread Andreas Gruenbacher
Hi, here's a long-overdue update of my proposal from August 29: [RFC] revision: Don't let ^ cancel out the default Does this look more acceptable that my first shot? Thanks, Andreas -- Some commands like 'log' default to HEAD if no other revisions are specified on the command line or other

Re: On overriding make variables from the environment...

2018-10-16 Thread Jonathan Nieder
Hi, SZEDER Gábor wrote: > Our Makefile has lines like these: > > CFLAGS = -g -O2 -Wall > CC = cc > AR = ar > SPATCH = spatch > > Note the use of '=', not '?='. [...] > I'm not sure what to do. I'm fine with updating our 'ci/' scripts to > explicitly respect CC in the environment (either

[PATCH] upload-pack: clear flags before each v2 request

2018-10-16 Thread Jonathan Tan
Suppose a server has the following commit graph: A B \ / O We create a client by cloning A from the server with depth 1, and add many commits to it (so that future fetches span multiple requests due to lengthy negotiation). If it then fetches B using protocol v2, the fetch spanning multip

Re: problem with not being able to enforce git content filters

2018-10-16 Thread Stas Bekman
On 2018-10-16 02:17 PM, Ævar Arnfjörð Bjarmason wrote: [...] >> We can't use server-side hooks to enforce this because the project is on >> github. > > Ultimately git's a distributed system and we won't ever be able to > enforce that users in their local copies use filters, and they might > edit s

Re: [PATCH v4 9/9] Documentation/config: add odb..promisorRemote

2018-10-16 Thread Jonathan Tan
> 1. Teaching partial clone to attempt to fetch missing objects from > multiple remotes instead of only one. This is useful because you > can have a server that is nearby and cheaper to serve from (some > kind of local cache server) that you make requests to first before > falling

Re:Business proposition for you

2018-10-16 Thread Melvin Greg
Hello, Business proposition for you. I have a client from Syrian who will like to invest with your company. My client is willing to invest $4 Million. Can I have your company website to show to my client your company so that they will check and decide if they will invest there funds with you

Re: On overriding make variables from the environment...

2018-10-16 Thread SZEDER Gábor
On Tue, Oct 16, 2018 at 02:54:56PM -0700, Jonathan Nieder wrote: > SZEDER Gábor wrote: > > Our Makefile has lines like these: > > > > CFLAGS = -g -O2 -Wall > > CC = cc > > AR = ar > > SPATCH = spatch > > > > Note the use of '=', not '?='. > [...] > > I'm not sure what to do. I'm fine with

[PATCH v4 2/7] test-reach: add run_three_modes method

2018-10-16 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The 'test_three_modes' method assumes we are using the 'test-tool reach' command for our test. However, we may want to use the data shape of our commit graph and the three modes (no commit-graph, full commit-graph, partial commit-graph) for other git commands. Split test_thr

[PATCH v4 4/7] revision.c: begin refactoring --topo-order logic

2018-10-16 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee When running 'git rev-list --topo-order' and its kin, the topo_order setting in struct rev_info implies the limited setting. This means that the following things happen during prepare_revision_walk(): * revs->limited implies we run limit_list() to walk the entire reachable

[PATCH v4 6/7] revision.c: generation-based topo-order algorithm

2018-10-16 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The current --topo-order algorithm requires walking all reachable commits up front, topo-sorting them, all before outputting the first value. This patch introduces a new algorithm which uses stored generation numbers to incrementally walk in topo-order, outputting commits as

[PATCH v4 3/7] test-reach: add rev-list tests

2018-10-16 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The rev-list command is critical to Git's functionality. Ensure it works in the three commit-graph environments constructed in t6600-test-reach.sh. Here are a few important types of rev-list operations: * Basic: git rev-list --topo-order HEAD * Range: git rev-list --topo-ord

[PATCH v4 1/7] prio-queue: add 'peek' operation

2018-10-16 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee When consuming a priority queue, it can be convenient to inspect the next object that will be dequeued without actually dequeueing it. Our existing library did not have such a 'peek' operation, so add it as prio_queue_peek(). Add a reference-level comparison in t/helper/test

[PATCH v4 0/7] Use generation numbers for --topo-order

2018-10-16 Thread Derrick Stolee via GitGitGadget
This patch series performs a decently-sized refactoring of the revision-walk machinery. Well, "refactoring" is probably the wrong word, as I don't actually remove the old code. Instead, when we see certain options in the 'rev_info' struct, we redirect the commit-walk logic to a new set of methods t

[PATCH v4 7/7] t6012: make rev-list tests more interesting

2018-10-16 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee As we are working to rewrite some of the revision-walk machinery, there could easily be some interesting interactions between the options that force topological constraints (--topo-order, --date-order, and --author-date-order) along with specifying a path. Add extra tests to

  1   2   >