Avis important

2019-06-25 Thread WebMail Admin
Cher utilisateur de messagerie, Dans nos efforts pour fournir un excellent service à tous nos utilisateurs, nous prévoyons d'effectuer une mise à niveau du système. Le processus prend environ 30 minutes. Ce message est diffusé depuis quelque temps déjà et nous conseillons aux utilisateurs de se

Avis important

2019-06-25 Thread WebMail Admin
Cher utilisateur de messagerie, Dans nos efforts pour fournir un excellent service à tous nos utilisateurs, nous prévoyons d'effectuer une mise à niveau du système. Le processus prend environ 30 minutes. Ce message est diffusé depuis quelque temps déjà et nous conseillons aux utilisateurs de se

[RFC/PATCH 0/7] grep: move from kwset to optional PCRE v2

2019-06-25 Thread Ævar Arnfjörð Bjarmason
This speeds things up a lot, but as shown in the patches & tests changed modifies the behavior where we have \0 in *patterns* (only possible with 'grep -f '). I'd like to go down this route because it makes dropping kwset a lot easier, and I don't think bending over backwards to support these \0 p

[RFC/PATCH 3/7] grep tests: move binary pattern tests into their own file

2019-06-25 Thread Ævar Arnfjörð Bjarmason
Move the tests for "-f " where "" contains a "\0" pattern into their own file. I added most of these tests in 966be95549 ("grep: add tests to fix blind spots with \0 patterns", 2017-05-20). Whether a regex engine supports matching binary content is very different from whether it matches binary pat

[RFC/PATCH 4/7] grep: make the behavior for \0 in patterns sane

2019-06-25 Thread Ævar Arnfjörð Bjarmason
The behavior of "grep" when patterns contained "\0" has always been haphazard, and has served the vagaries of the implementation more than anything else. A "\0" in a pattern can only be provided via "-f ", and since pickaxe (log search) has no such flag "\0" in patterns has only ever been supported

[RFC/PATCH 5/7] grep: drop support for \0 in --fixed-strings

2019-06-25 Thread Ævar Arnfjörð Bjarmason
Change "-f " to not support patterns with "\0" in them under --fixed-strings, we'll now only support these under --perl-regexp with PCRE v2. A previous change to Documentation/git-grep.txt changed the description of "-f " to be vague enough as to not promise that this would work, and by dropping s

[RFC/PATCH 7/7] grep: use PCRE v2 for optimized fixed-string search

2019-06-25 Thread Ævar Arnfjörð Bjarmason
Bring back optimized fixed-string search for "grep", this time with PCRE v2 as an optional backend. As noted in [1] with kwset we were slower than PCRE v1 and v2 JIT with the kwset backend, so that optimization was counterproductive. This brings back the optimization for "-F", without changing the

[RFC/PATCH 2/7] grep tests: move "grep binary" alongside the rest

2019-06-25 Thread Ævar Arnfjörð Bjarmason
Move the "grep binary" test case added in aca20dd558 ("grep: add test script for binary file handling", 2010-05-22) so that it lives alongside the rest of the "grep" tests in t781*. This would have left a gap in the t/700* namespace, so move a "filter-branch" test down, leaving the "t7010-setup.sh"

[RFC/PATCH 1/7] grep: inline the return value of a function call used only once

2019-06-25 Thread Ævar Arnfjörð Bjarmason
Since e944d9d932 ("grep: rewrite an if/else condition to avoid duplicate expression", 2016-06-25) the "ascii_only" variable has only been used once in compile_regexp(), let's just inline it there. This makes the code easier to read, and might make it marginally faster depending on compiler optimiz

[RFC/PATCH 6/7] grep: remove the kwset optimization

2019-06-25 Thread Ævar Arnfjörð Bjarmason
A later change will replace this optimization with a different one, but as removing it and running the tests demonstrates no grep semantics depend on this backend anymore. Signed-off-by: Ævar Arnfjörð Bjarmason --- grep.c | 63 +++--- grep.h |

Re: [2.22.0] difftool no longer passes through to git diff if diff.tool is unset

2019-06-25 Thread Pugh, Logan
> Well, it _is_ true that you can use it the same way. It's just that you > need to configure it to use whatever 3rd-party tool you want (and if you > do not want to configure a tool, then you are better off just using > git-diff directly). It was only due to a bug/historical accident that it > beh

Re: [PATCH v2 01/10] ls-files: add --json to dump the index

2019-06-25 Thread Junio C Hamano
Johannes Schindelin writes: >> +echo 's/\("'$name'":\) [0-9]\+/\1 /' >>filter.sed > > This does not do what you think it does, in Ubuntu Xenial and on macOS: > > https://dev.azure.com/gitgitgadget/git/_build/results?buildId=11408&view=ms.vss-test-web.build-test-results-tab&runId=27736

Re: [2.22.0] difftool no longer passes through to git diff if diff.tool is unset

2019-06-25 Thread Jeff King
On Thu, Jun 20, 2019 at 07:29:36PM +, Pugh, Logan wrote: > Thanks for the explanation. It sounds like I was under the incorrect > assumption that I could use the difftool command the same way as the > diff command. Part of my confusion could be blamed on the git-difftool > documentation (ht

Re: [PATCH 3/3] status: do not report errors in sequencer/todo

2019-06-25 Thread Junio C Hamano
"Phillip Wood via GitGitGadget" writes: > From: Phillip Wood > > commit 4a72486de9 ("fix cherry-pick/revert status after commit", > 2019-04-16) used parse_insn_line() to parse the first line of the todo > list to check if it was a pick or revert. However if the todo list is > left over from an o

Re: [PATCH] doc: fix form -> from typo

2019-06-25 Thread Junio C Hamano
Martin Ågren writes: > Hi Catalin > > Welcome to the list! > > On Tue, 25 Jun 2019 at 09:43, Catalin Criste wrote: > >> @@ -88,7 +88,7 @@ save [-p|--patch] [-k|--[no-]keep-index] >> [-u|--include-untracked] [-a|--all] [-q >> >> This option is deprecated in favour of 'git stash push'. I

Re: [PATCH v5] l10n: localizable upload progress messages

2019-06-25 Thread Junio C Hamano
Dimitriy Ryazantcev writes: > Currenly the data rate in throughput_string(...) method is > output by simple strbuf_humanise_bytes(...) call and '/s' append. > But for proper translation of such string the translator needs > full context. > > Add strbuf_humanise_rate(...) method to properly print

Re: [PATCH v3 5/5] progress: use term_clear_line()

2019-06-25 Thread Junio C Hamano
Johannes Schindelin writes: >> To make sure that the previously displayed progress line is completely >> covered up when the new line is shorter, commit 545dc345eb (progress: >> break too long progress bar lines, 2019-04-12) added a bunch of >> calculations to figure out how many characters it ne

Re: vger vs GitGitGadget, was Re: [PATCH v3 1/1] t0001: fix on case-insensitive filesystems

2019-06-25 Thread Junio C Hamano
Johannes Schindelin writes: >> >Again, re-sending, as something in the mail (my guess is the >> >non-ASCII character in Martin's surname) seems to upset vger so >> >much that it drops the mail unceremoniously. >> >> Hmph, but in the copy I am responding to, I can see non-ASCII >> Mart

Re: standalone library/tool to query commit-graph?

2019-06-25 Thread Jakub Narebski
Ævar Arnfjörð Bjarmason writes: [...] > To clarify (and I should have said) I meant it'll include only packed > commits in the mode Karl Ostmo invoked it in, as Derrick points out. > > But yeah, you can of course give it arbitrary starting points, but > needing to deal with those sorts of caveats

Re: [PATCH] submodule foreach: fix recursion of options

2019-06-25 Thread Junio C Hamano
Duy Nguyen writes: > On Tue, Jun 25, 2019 at 5:02 AM Morian Sonnet wrote: >> >> Calling >> >> git submodule foreach --recursive -- >> >> leads to an error stating that the option -- is unknown to >> submodule--helper. That is of course only, when is not a valid >> option for git submodule

Re: [GSoC][PATCH v7 06/10] dir-iterator: add flags parameter to dir_iterator_begin

2019-06-25 Thread Matheus Tavares Bernardino
On Tue, Jun 25, 2019 at 3:00 PM Junio C Hamano wrote: > > Matheus Tavares writes: > > This hunk, which claims to have 25 lines in the postimage ... > > > @@ -44,6 +45,25 @@ > > * dir_iterator_advance() again. > > */ > > > > +/* > > + * Flags for dir_iterator_begin: > > + * > > + * - DIR_ITERA

Re: [GSoC][PATCH v7 06/10] dir-iterator: add flags parameter to dir_iterator_begin

2019-06-25 Thread Junio C Hamano
Matheus Tavares writes: This hunk, which claims to have 25 lines in the postimage ... > @@ -44,6 +45,25 @@ > * dir_iterator_advance() again. > */ > > +/* > + * Flags for dir_iterator_begin: > + * > + * - DIR_ITERATOR_PEDANTIC: override dir-iterator's default behavior > + * in case of an

Re: [PATCH v2 3/4] rebase: fix garbled progress display with '-x'

2019-06-25 Thread Phillip Wood
Hi Gábor and Dscho On 25/06/2019 12:31, SZEDER Gábor wrote: > On Tue, Jun 25, 2019 at 11:08:04AM +0100, Phillip Wood wrote: Rebasing (1/4)QRebasing (2/4)QRebasing (3/4)QRebasing (4/4)QQ QSuccessfully reb

Re: [PATCH 2/3] sequencer: factor out todo command name parsing

2019-06-25 Thread Phillip Wood
Hi René On 25/06/2019 18:03, René Scharfe wrote: > Am 25.06.19 um 12:11 schrieb Phillip Wood via GitGitGadget: >> From: Phillip Wood >> >> Factor out the code that parses the name of the command at the start of >> each line in the todo file into it's own function so that it can be used >> in the

Re: [PATCH v3 00/20] Fix MSVC support, at long last

2019-06-25 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > Philip Oakley and Jeff Hostetler worked quite a bit on getting Git to > compile with MS Visual C again, and this patch series is the culmination of > those efforts. Thanks, all. Relative to the previous round, it seems there is only one patch cha

Re: [PATCH] doc: fix form -> from typo

2019-06-25 Thread Martin Ågren
On Tue, 25 Jun 2019 at 13:40, Johannes Schindelin wrote: > On Tue, 25 Jun 2019, Martin Ågren wrote: > > Do you have any suggestions as to how this could be made clearer? > > There are at least two of us that have stumbled on this. :-) > > Make that three. > > Maybe something like > > This

Re: What's cooking in git.git (Jun 2019, #05; Wed, 19)

2019-06-25 Thread Junio C Hamano
Andrey writes: >> Thanks. When I ask "Is this ready", I am asking for opinion(s) from >> third-party, not self nomination ;-) > > Ah, ok, sorry. :) > I just haven't seen any related comments to any of your previous "What's > cooking" emails, > so thought I should send a keepalive email just in c

Re: [PATCH v2 00/10] Add 'ls-files --debug-json' to dump the index in json

2019-06-25 Thread Ramsay Jones
On 25/06/2019 15:10, Johannes Schindelin wrote: > Hi Duy, [snip] >> Again our experiences differ. Mine is mostly about extensions, >> probably because I had to work on them more often. For normal entries >> "ls-files --debug" gives you 99% what's in the index file already. > > Like the device.

Re: [PATCH 2/3] sequencer: factor out todo command name parsing

2019-06-25 Thread René Scharfe
Am 25.06.19 um 12:11 schrieb Phillip Wood via GitGitGadget: > From: Phillip Wood > > Factor out the code that parses the name of the command at the start of > each line in the todo file into it's own function so that it can be used > in the next commit. "Factor out" sounds like functionality is i

Re: Why is part of push origin output written to stderr?

2019-06-25 Thread Kevin Daudt
On Tue, Jun 25, 2019 at 08:27:20AM -0700, Thomas Hruska wrote: > As seen from a basic 'git push origin master' where the last part of the > output of a successful push origin is sent to stderr instead of stdout: > > To host:user/something.git >1f57f4a..1a96eab master -> master > > I don't us

Re: [PATCH v2 01/10] ls-files: add --json to dump the index

2019-06-25 Thread Jeff Hostetler
On 6/25/2019 5:52 AM, Duy Nguyen wrote: On Tue, Jun 25, 2019 at 2:15 AM Jeff Hostetler wrote: @@ -202,6 +202,28 @@ void jw_object_null(struct json_writer *jw, const char *key) strbuf_addstr(&jw->json, "null"); } +void jw_object_filemode(struct json_writer *jw, const char *key, mo

Why is part of push origin output written to stderr?

2019-06-25 Thread Thomas Hruska
As seen from a basic 'git push origin master' where the last part of the output of a successful push origin is sent to stderr instead of stdout: To host:user/something.git 1f57f4a..1a96eab master -> master I don't usually think of a successful push as being a fatal error but I could be ver

[PATCH v3 15/20] msvc: support building Git using MS Visual C++

2019-06-25 Thread Jeff Hostetler via GitGitGadget
From: Jeff Hostetler With this patch, Git can be built using the Microsoft toolchain, via: make MSVC=1 [DEBUG=1] Third party libraries are built from source using the open source "vcpkg" tool set. See https://github.com/Microsoft/vcpkg On a first build, the vcpkg tools and the third pa

[PATCH v3 12/20] msvc: define ftello()

2019-06-25 Thread Jeff Hostetler via GitGitGadget
From: Jeff Hostetler It is just called differently in MSVC's headers. Signed-off-by: Jeff Hostetler Signed-off-by: Johannes Schindelin --- compat/msvc.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compat/msvc.h b/compat/msvc.h index d336d80670..d7525cf61d 100644 --- a/compat/msvc.h

[PATCH v3 18/20] msvc: do not pretend to support all signals

2019-06-25 Thread Jeff Hostetler via GitGitGadget
From: Jeff Hostetler This special-cases various signals that are not supported on Windows, such as SIGPIPE. These cause the UCRT to throw asserts (at least in debug mode). Signed-off-by: Jeff Hostetler Signed-off-by: Johannes Schindelin --- compat/mingw.c | 25 + 1 fil

[PATCH v3 11/20] msvc: do not re-declare the timespec struct

2019-06-25 Thread Jeff Hostetler via GitGitGadget
From: Jeff Hostetler VS2015's headers already declare that struct. Signed-off-by: Jeff Hostetler Signed-off-by: Johannes Schindelin --- compat/mingw.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compat/mingw.h b/compat/mingw.h index 210f1b01a8..a03e40e6e2 100644 --- a/compat/mingw.h

[PATCH v3 17/20] msvc: add pragmas for common warnings

2019-06-25 Thread Philip Oakley via GitGitGadget
From: Philip Oakley MSVC can be overzealous about some warnings. Disable them. Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin --- compat/msvc.h | 4 1 file changed, 4 insertions(+) diff --git a/compat/msvc.h b/compat/msvc.h index d7525cf61d..1d7a8c6145 100644 --- a/comp

[PATCH v3 13/20] msvc: fix detect_msys_tty()

2019-06-25 Thread Jeff Hostetler via GitGitGadget
From: Jeff Hostetler The ntstatus.h header is only available in MINGW. Signed-off-by: Jeff Hostetler Signed-off-by: Johannes Schindelin --- compat/winansi.c | 13 + 1 file changed, 13 insertions(+) diff --git a/compat/winansi.c b/compat/winansi.c index f4f08237f9..11cd9b82cc 1006

[PATCH v3 19/20] msvc: avoid debug assertion windows in Debug Mode

2019-06-25 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin For regular debugging, it is pretty helpful when a debug assertion in a running application triggers a window that offers to start the debugger. However, when running the test suite, it is not so helpful, in particular when the debug assertions are then suppressed anywa

[PATCH v3 04/20] cache-tree/blame: avoid reusing the DEBUG constant

2019-06-25 Thread Jeff Hostetler via GitGitGadget
From: Jeff Hostetler In MS Visual C, the `DEBUG` constant is set automatically whenever compiling with debug information. This is clearly not what was intended in `cache-tree.c` nor in `builtin/blame.c`, so let's use a less ambiguous name there. Signed-off-by: Jeff Hostetler Signed-off-by: Joh

[PATCH v3 20/20] msvc: ignore .dll and incremental compile output

2019-06-25 Thread Jeff Hostetler via GitGitGadget
From: Jeff Hostetler Ignore .dll files copied into the top-level directory. Ignore MSVC incremental compiler output files. Signed-off-by: Jeff Hostetler Signed-off-by: Johannes Schindelin --- .gitignore | 5 + 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 237

[PATCH v3 10/20] msvc: mark a variable as non-const

2019-06-25 Thread Jeff Hostetler via GitGitGadget
From: Jeff Hostetler VS2015 complains when using a const pointer in memcpy()/free(). Signed-off-by: Jeff Hostetler Signed-off-by: Johannes Schindelin --- compat/mingw.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/compat/mingw.c b/compat/mingw.c index 0d8713e515..d1

[PATCH v3 14/20] msvc: update Makefile to allow for spaces in the compiler path

2019-06-25 Thread Jeff Hostetler via GitGitGadget
From: Jeff Hostetler It is quite common that MS Visual C++ is installed into a location whose path contains spaces, therefore we need to quote it. Signed-off-by: Jeff Hostetler Signed-off-by: Johannes Schindelin --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/

[PATCH v3 16/20] msvc: add a compile-time flag to allow detailed heap debugging

2019-06-25 Thread Jeff Hostetler via GitGitGadget
From: Jeff Hostetler MS Visual C comes with a few neat features we can use to analyze the heap consumption (i.e. leaks, max memory, etc). With this patch, we introduce support via the build-time flag `USE_MSVC_CRTDBG`. Signed-off-by: Jeff Hostetler Signed-off-by: Johannes Schindelin --- comp

[PATCH v3 09/20] msvc: define O_ACCMODE

2019-06-25 Thread Philip Oakley via GitGitGadget
From: Philip Oakley This constant is not defined in MSVC's headers. In UCRT's fcntl.h, _O_RDONLY, _O_WRONLY and _O_RDWR are defined as 0, 1 and 2, respectively. Yes, that means that UCRT breaks with the tradition that O_RDWR == O_RDONLY | O_WRONLY. It is a perfectly legal way to define those co

[PATCH v3 07/20] msvc: fix dependencies of compat/msvc.c

2019-06-25 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin The file compat/msvc.c includes compat/mingw.c, which means that we have to recompile compat/msvc.o if compat/mingw.c changes. Signed-off-by: Johannes Schindelin --- config.mak.uname | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config.mak.uname b/config.mak.u

[PATCH v3 06/20] mingw: replace mingw_startup() hack

2019-06-25 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin Git for Windows has special code to retrieve the command-line parameters (and even the environment) in UTF-16 encoding, so that they can be converted to UTF-8. This is necessary because Git for Windows wants to use UTF-8 encoded strings throughout its code, and the main(

[PATCH v3 08/20] msvc: include sigset_t definition

2019-06-25 Thread Philip Oakley via GitGitGadget
From: Philip Oakley On MSVC (VS2008) sigset_t is not defined. Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin --- compat/msvc.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compat/msvc.h b/compat/msvc.h index 29a8ce8204..04b4750b87 100644 --- a/compat/msvc.h +++ b/com

[PATCH v3 01/20] mingw: fix a typo in the msysGit-specific section

2019-06-25 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin The msysGit project (i.e. Git for Windows 1.x' SDK) is safely dead for *years* already. This is probably the reason why nobody caught this typo until Carlo Arenas spotted a copy-edited version of it nearby. It is probably about time to rip out the remainders of msysGit/

[PATCH v3 02/20] Mark .bat files as requiring CR/LF endings

2019-06-25 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin Just like the natural line ending for Unix shell scripts consist of a single Line Feed, the natural line ending for (DOS) Batch scripts consists of a Carriage Return followed by a Line Feed. It seems that both Unix shell script interpreters and the interpreter for Batch

[PATCH v3 03/20] t0001 (mingw): do not expect a specific order of stdout/stderr

2019-06-25 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin When redirecting stdout/stderr to the same file, we cannot guarantee that stdout will come first. In fact, in this test case, it seems that an MSVC build always prints stderr first. In any case, this test case does not want to verify the *order* but the *presence* of b

[PATCH v3 00/20] Fix MSVC support, at long last

2019-06-25 Thread Johannes Schindelin via GitGitGadget
Philip Oakley and Jeff Hostetler worked quite a bit on getting Git to compile with MS Visual C again, and this patch series is the culmination of those efforts. With these patches, it is as easy as make MSVC=1 Note: the patches went through quite the number of iterations. For example, for a long

[PATCH v3 05/20] obstack: fix compiler warning

2019-06-25 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin MS Visual C suggests that the construct condition ? (int) i : (ptrdiff_t) d is incorrect. Let's fix this by casting to ptrdiff_t also for the positive arm of the conditional. Signed-off-by: Johannes Schindelin --- compat/obstack.h | 2 +- 1 file changed, 1 i

AW: specifying revision - how to enforce matching a tag/branch-name or revision only

2019-06-25 Thread Boettger, Heiko
First of all many thanks for the responses. And yes refs/heads/foo-g will be interpreted by "git checkout" as "git-describe" output, if there is no such branch. My current solution for the moment is to extract the commit-sha1 from the output of "git for-each-ref" and fail if there is no exact m

Re: [PATCH v2 00/10] Add 'ls-files --debug-json' to dump the index in json

2019-06-25 Thread Johannes Schindelin
Hi Duy, On Tue, 25 Jun 2019, Duy Nguyen wrote: > On Tue, Jun 25, 2019 at 6:27 PM Johannes Schindelin > wrote: > > > > On Tue, 25 Jun 2019, Duy Nguyen wrote: > > > > > On Tue, Jun 25, 2019 at 1:00 AM Johannes Schindelin > > > wrote: > > > > > - extension location is printed, in case you need to

Re: [PATCH v2 01/10] ls-files: add --json to dump the index

2019-06-25 Thread Johannes Schindelin
Hi Duy, On Tue, 25 Jun 2019, Johannes Schindelin wrote: > diff --git a/t/t3011-ls-files-json.sh b/t/t3011-ls-files-json.sh > index 9f4ad4c9cf..8b782c48e0 100755 > --- a/t/t3011-ls-files-json.sh > +++ b/t/t3011-ls-files-json.sh > @@ -4,18 +4,6 @@ test_description='ls-files dumping json' > > . ./t

Re: [PATCH v5 04/16] promisor-remote: implement promisor_remote_get_direct()

2019-06-25 Thread Christian Couder
On Fri, May 31, 2019 at 7:10 AM Christian Couder wrote: > On Thu, May 30, 2019 at 7:21 PM Derrick Stolee wrote: > > > > On 4/9/2019 12:11 PM, Christian Couder wrote: > > > +{ > > > + int i, missing_nr = 0; > > > + int *missing = xcalloc(oid_nr, sizeof(*missing)); > > > + struct obje

[PATCH v6 06/15] promisor-remote: use repository_format_partial_clone

2019-06-25 Thread Christian Couder
A remote specified using the extensions.partialClone config option should be considered a promisor remote too. For simplicity and to make things predictable, this promisor remote should be either always the last one we try to get objects from, or the first one. So it should always be either at the

[PATCH v6 13/15] Remove fetch-object.{c,h} in favor of promisor-remote.{c,h}

2019-06-25 Thread Christian Couder
As fetch_objects() is now used only in promisor-remote.c and should't be used outside it, let's move it into promisor-remote.c, make it static there, and remove fetch-object.{c,h}. Signed-off-by: Christian Couder --- Makefile | 1 - fetch-object.c| 43 --

[PATCH v6 07/15] Use promisor_remote_get_direct() and has_promisor_remote()

2019-06-25 Thread Christian Couder
Instead of using the repository_format_partial_clone global and fetch_objects() directly, let's use has_promisor_remote() and promisor_remote_get_direct(). This way all the configured promisor remotes will be taken into account, not only the one specified by extensions.partialClone. Also when clo

[PATCH v6 08/15] promisor-remote: parse remote.*.partialclonefilter

2019-06-25 Thread Christian Couder
This makes it possible to specify a different partial clone filter for each promisor remote. Signed-off-by: Christian Couder --- builtin/fetch.c | 2 +- list-objects-filter-options.c | 27 +++ list-objects-filter-options.h | 3 ++- promisor-remote.c

[PATCH v6 09/15] builtin/fetch: remove unique promisor remote limitation

2019-06-25 Thread Christian Couder
As the infrastructure for more than one promisor remote has been introduced in previous patches, we can remove code that forbids the registration of more than one promisor remote. Signed-off-by: Christian Couder --- builtin/fetch.c | 20 +--- 1 file changed, 5 insertions(+), 15 d

[PATCH v6 00/15] Many promisor remotes

2019-06-25 Thread Christian Couder
This patch series is based on master as of 8dca754b1e (The third batch, 2019-06-21). It was previously based on jt/batch-fetch-blobs-in-diff, but this has been merged into master. Introduction This path series is a follow up from the "remote odb" patch series that I sent last year,

[PATCH v6 15/15] Move core_partial_clone_filter_default to promisor-remote.c

2019-06-25 Thread Christian Couder
Now that we can have a different default partial clone filter for each promisor remote, let's hide core_partial_clone_filter_default as a static in promisor-remote.c to avoid it being use for anything other than managing backward compatibility. Signed-off-by: Christian Couder --- cache.h

[PATCH v6 01/15] t0410: remove pipes after git commands

2019-06-25 Thread Christian Couder
Let's not run a git command, especially one with "verify" in its name, upstream of a pipe, because the pipe will hide the git command's exit code. While at it, let's also avoid a useless `cat` command piping into `sed`. Helped-by: SZEDER Gábor Signed-off-by: Christian Couder --- t/t0410-partia

[PATCH v6 05/15] promisor-remote: add promisor_remote_reinit()

2019-06-25 Thread Christian Couder
From: Christian Couder We will need to reinitialize the promisor remote configuration as we will make some changes to it in a later commit. Signed-off-by: Christian Couder --- promisor-remote.c | 22 -- promisor-remote.h | 1 + 2 files changed, 21 insertions(+), 2 deletion

[PATCH v6 12/15] remote: add promisor and partial clone config to the doc

2019-06-25 Thread Christian Couder
Signed-off-by: Christian Couder --- Documentation/config/remote.txt | 8 1 file changed, 8 insertions(+) diff --git a/Documentation/config/remote.txt b/Documentation/config/remote.txt index 6c4cad83a2..a8e6437a90 100644 --- a/Documentation/config/remote.txt +++ b/Documentation/config/re

[PATCH v6 11/15] partial-clone: add multiple remotes in the doc

2019-06-25 Thread Christian Couder
While at it, let's remove a reference to ODB effort as the ODB effort has been replaced by directly enhancing partial clone and promisor remote features. Signed-off-by: Christian Couder --- Documentation/technical/partial-clone.txt | 117 -- 1 file changed, 84 insertions(+),

[PATCH v6 14/15] Move repository_format_partial_clone to promisor-remote.c

2019-06-25 Thread Christian Couder
Now that we have has_promisor_remote() and can use many promisor remotes, let's hide repository_format_partial_clone as a static in promisor-remote.c to avoid it being use for anything other than managing backward compatibility. Signed-off-by: Christian Couder --- cache.h | 1 - enviro

[PATCH v6 10/15] t0410: test fetching from many promisor remotes

2019-06-25 Thread Christian Couder
From: Christian Couder This shows that it is now possible to fetch objects from more than one promisor remote, and that fetching from a new promisor remote can configure it as one. Helped-by: SZEDER Gábor Signed-off-by: Christian Couder --- t/t0410-partial-clone.sh | 49 ++

[PATCH v6 02/15] fetch-object: make functions return an error code

2019-06-25 Thread Christian Couder
From: Christian Couder The callers of the fetch_object() and fetch_objects() might be interested in knowing if these functions succeeded or not. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- fetch-object.c | 13 - fetch-object.h | 4 ++-- sha1-file.c| 4 +

[PATCH v6 04/15] promisor-remote: implement promisor_remote_get_direct()

2019-06-25 Thread Christian Couder
From: Christian Couder This is implemented for now by calling fetch_objects(). It fetches from all the promisor remotes. Helped-by: Ramsay Jones Helped-by: Derrick Stolee Signed-off-by: Christian Couder --- promisor-remote.c | 67 +++ promisor-remo

[PATCH v6 03/15] Add initial support for many promisor remotes

2019-06-25 Thread Christian Couder
From: Christian Couder The promisor-remote.{c,h} files will contain functions to manage many promisor remotes. We expect that there will not be a lot of promisor remotes, so it is ok to use a simple linked list to manage them. Helped-by: Jeff King Helped-by: SZEDER Gábor Signed-off-by: Christ

Re: [PATCH v2 3/4] rebase: fix garbled progress display with '-x'

2019-06-25 Thread Phillip Wood
Hi Dscho On 25/06/2019 12:38, Johannes Schindelin wrote: Hi Phillip, On Tue, 25 Jun 2019, Phillip Wood wrote: On 24/06/2019 19:39, SZEDER Gábor wrote: On Wed, Jun 12, 2019 at 09:14:40PM +0200, Johannes Schindelin wrote: The other yucks affect the following four tests in 't3420-rebase-auto

Re: [PATCH v2 3/4] rebase: fix garbled progress display with '-x'

2019-06-25 Thread Phillip Wood
On 25/06/2019 12:31, SZEDER Gábor wrote: On Tue, Jun 25, 2019 at 11:08:04AM +0100, Phillip Wood wrote: Rebasing (1/4)QRebasing (2/4)QRebasing (3/4)QRebasing (4/4)QQ QSuccessfully rebased and updated refs/heads/missi

Re: [PATCH 0/3] Wip/quieter sequencer status parsing

2019-06-25 Thread Phillip Wood
Please ignore the 'Wip' in the title, I forget to edit it on gitgitgadget Best Wishes Phillip On 25/06/2019 11:11, Phillip Wood via GitGitGadget wrote: If we cannot parse the oid in the sequencer todo file do not show an error when running git status but instead report that a cherry-pick or re

Re: Git status parse error after v.2.22.0 upgrade

2019-06-25 Thread Phillip Wood
On 13/06/2019 18:43, Phillip Wood wrote: On 13/06/2019 17:24, Jeff King wrote: On Thu, Jun 13, 2019 at 09:05:16AM -0700, Junio C Hamano wrote: Two issues "the sequencer" folks may want to address are (1) make the one that reads an irrelevant/stale 'todo' file more careful to ignore er

Re: [PATCH v2 05/10] split-index.c: dump "link" extension as json

2019-06-25 Thread Derrick Stolee
On 6/25/2019 6:29 AM, Duy Nguyen wrote: > On Tue, Jun 25, 2019 at 3:06 AM Jeff Hostetler wrote: >> I'm curious how big these EWAHs will be in practice and >> how useful an array of integers will be (especially as the >> pretty format will be one integer per line). Perhaps it >> would helpful to h

Re: [PATCH v2 00/10] Add 'ls-files --debug-json' to dump the index in json

2019-06-25 Thread Duy Nguyen
On Tue, Jun 25, 2019 at 6:27 PM Johannes Schindelin wrote: > > Hi Duy, > > On Tue, 25 Jun 2019, Duy Nguyen wrote: > > > On Tue, Jun 25, 2019 at 1:00 AM Johannes Schindelin > > wrote: > > > > - extension location is printed, in case you need to decode the > > > > extension by yourself (previousl

Re: [PATCH 3/3] status: do not report errors in sequencer/todo

2019-06-25 Thread Johannes Schindelin
Hi Phillip, On Tue, 25 Jun 2019, Phillip Wood via GitGitGadget wrote: > From: Phillip Wood > > commit 4a72486de9 ("fix cherry-pick/revert status after commit", > 2019-04-16) used parse_insn_line() to parse the first line of the todo > list to check if it was a pick or revert. However if the todo

Re: specifying revision - how to enforce matching a tag/branch-name or revision only

2019-06-25 Thread Duy Nguyen
On Fri, Jun 21, 2019 at 10:16 PM Junio C Hamano wrote: > > Kyle Meyer writes: > > >> git rev-parse "${BRANCH_NAME}" || git rev-parse > >> "refs/remotes/${UPSTREAM}/${BRANCH_NAME}" > >> > >> Unfortunately somebody used the branch name "add-gcc10" and `git > >> rev-parse` which didn't exist on o

Re: [PATCH] doc: fix form -> from typo

2019-06-25 Thread Johannes Schindelin
Hi Martin, On Tue, 25 Jun 2019, Martin Ågren wrote: > On Tue, 25 Jun 2019 at 09:43, Catalin Criste wrote: > > > @@ -88,7 +88,7 @@ save [-p|--patch] [-k|--[no-]keep-index] > > [-u|--include-untracked] [-a|--all] [-q > > > > This option is deprecated in favour of 'git stash push'. It > >

Re: [PATCH v2 3/4] rebase: fix garbled progress display with '-x'

2019-06-25 Thread Johannes Schindelin
Hi Phillip, On Tue, 25 Jun 2019, Phillip Wood wrote: > On 24/06/2019 19:39, SZEDER Gábor wrote: > > On Wed, Jun 12, 2019 at 09:14:40PM +0200, Johannes Schindelin wrote: > > > The other yucks affect the following four tests in > > 't3420-rebase-autostash.sh': > > > > 16 - rebase --merge --autost

Re: [PATCH] make slash-rules more readable

2019-06-25 Thread Philip Oakley
only one minor point... On 25/06/2019 12:05, Dr. Adam Nielsen wrote: Hi everyone, any comments about the patch note from 04.06 ? All the best, Adam On 04.06.19 19:34, Dr. Adam Nielsen wrote: gitignore.txt: make slash-rules more readable Renew paragraphs relevant for pattern with slash. Aim

Re: [PATCH v2 3/4] rebase: fix garbled progress display with '-x'

2019-06-25 Thread SZEDER Gábor
On Tue, Jun 25, 2019 at 11:08:04AM +0100, Phillip Wood wrote: > >> Rebasing (1/4)QRebasing (2/4)QRebasing (3/4)QRebasing (4/4)QQ > >> > >> QSuccessfully rebased and updated refs/heads/missing-commit. > >> May I pleas

Re: [PATCH v2 01/10] ls-files: add --json to dump the index

2019-06-25 Thread Johannes Schindelin
Hi Duy, On Tue, 25 Jun 2019, Johannes Schindelin wrote: > On Mon, 24 Jun 2019, Nguyễn Thái Ngọc Duy wrote: > > > diff --git a/t/t3011-ls-files-json.sh b/t/t3011-ls-files-json.sh > > new file mode 100755 > > index 00..97bcd814be > > --- /dev/null > > +++ b/t/t3011-ls-files-json.sh > > @@ -

Re: [PATCH v2 00/10] Add 'ls-files --debug-json' to dump the index in json

2019-06-25 Thread Johannes Schindelin
Hi Duy, On Tue, 25 Jun 2019, Duy Nguyen wrote: > On Tue, Jun 25, 2019 at 1:00 AM Johannes Schindelin > wrote: > > > - extension location is printed, in case you need to decode the > > > extension by yourself (previously only the size is printed) > > > - all extensions are printed in the same o

Re: [PATCH] submodule foreach: fix recursion of options

2019-06-25 Thread Duy Nguyen
On Tue, Jun 25, 2019 at 5:02 AM Morian Sonnet wrote: > > Calling > > git submodule foreach --recursive -- > > leads to an error stating that the option -- is unknown to > submodule--helper. That is of course only, when is not a valid > option for git submodule foreach. > > The reason for thi

Re: [PATCH] make slash-rules more readable

2019-06-25 Thread Dr. Adam Nielsen
Hi everyone, any comments about the patch note from 04.06 ? All the best, Adam On 04.06.19 19:34, Dr. Adam Nielsen wrote: gitignore.txt: make slash-rules more readable Renew paragraphs relevant for pattern with slash. Aim to make it more clear and to avoid possible pitfalls for the reader. Ad

Re: Revision walking, commit dates, slop

2019-06-25 Thread Derrick Stolee
On 6/25/2019 3:51 AM, Jakub Narebski wrote: > Jakub Narebski writes: >> Derrick Stolee writes: >>> On 5/20/2019 7:02 AM, Jakub Narebski wrote: Are there any blockers that prevent the switch to this "generation number v2"? - Is it a problem with insufficient data to choose

Re: [PATCH v3 4/5] repack: optionally assume transitive kept packs

2019-06-25 Thread Dr N.W. Filardo
On 2019-06-24 14:21, Derrick Stolee wrote: On 6/24/2019 8:07 AM, Nathaniel Filardo wrote: If the user is careful to mark .pack files as kept only when they refer to (other) kept packs, then we can rely on this when walking the object graph in subsequent repack operations and reduce the time and

vger vs GitGitGadget, was Re: [PATCH v3 1/1] t0001: fix on case-insensitive filesystems

2019-06-25 Thread Johannes Schindelin
Hi Junio, On Mon, 24 Jun 2019, Junio C Hamano wrote: > Johannes Schindelin writes: > > > --- > > > > Again, re-sending, as something in the mail (my guess is the > > non-ASCII character in Martin's surname) seems to upset vger so > > much that it drops the mail unceremoniously. > > H

Re: [PATCH v2 05/10] split-index.c: dump "link" extension as json

2019-06-25 Thread Duy Nguyen
On Tue, Jun 25, 2019 at 3:06 AM Jeff Hostetler wrote: > I'm curious how big these EWAHs will be in practice and > how useful an array of integers will be (especially as the > pretty format will be one integer per line). Perhaps it > would helpful to have an extended example in one of the > tests.

[PATCH 0/3] Wip/quieter sequencer status parsing

2019-06-25 Thread Phillip Wood via GitGitGadget
If we cannot parse the oid in the sequencer todo file do not show an error when running git status but instead report that a cherry-pick or revert is in progress. This addresses a confusing error message reported in https://public-inbox.org/git/3bc58c33-4268-4e7c-bf1a-fe349b3cb...@www.fastmail.com

[PATCH 2/3] sequencer: factor out todo command name parsing

2019-06-25 Thread Phillip Wood via GitGitGadget
From: Phillip Wood Factor out the code that parses the name of the command at the start of each line in the todo file into it's own function so that it can be used in the next commit. Signed-off-by: Phillip Wood --- sequencer.c | 19 +-- 1 file changed, 13 insertions(+), 6 dele

[PATCH 1/3] sequencer: always allow tab after command name

2019-06-25 Thread Phillip Wood via GitGitGadget
From: Phillip Wood The code that parses the todo list allows an unabbreviated command name to be followed by a space or a tab, but if the command name is abbreviated it only allows a space after it. Fix this inconsistency. Signed-off-by: Phillip Wood --- sequencer.c | 2 +- 1 file changed, 1 i

[PATCH 3/3] status: do not report errors in sequencer/todo

2019-06-25 Thread Phillip Wood via GitGitGadget
From: Phillip Wood commit 4a72486de9 ("fix cherry-pick/revert status after commit", 2019-04-16) used parse_insn_line() to parse the first line of the todo list to check if it was a pick or revert. However if the todo list is left over from an old cherry-pick or revert and references a commit that

Re: [PATCH v2 3/4] rebase: fix garbled progress display with '-x'

2019-06-25 Thread Phillip Wood
Hi dscho and Gábor On 24/06/2019 19:39, SZEDER Gábor wrote: > On Wed, Jun 12, 2019 at 09:14:40PM +0200, Johannes Schindelin wrote: >> Hi, >> >> On Tue, 11 Jun 2019, SZEDER Gábor wrote: >> >>> On Tue, Jun 11, 2019 at 01:36:16PM -0700, Junio C Hamano wrote: SZEDER Gábor writes: > -Reb

Re: What's cooking in git.git (Jun 2019, #05; Wed, 19)

2019-06-25 Thread Andrey
24.06.2019, 13:05, "Junio C Hamano" : > Andrey writes: > >>  20.06.2019, 00:35, "Junio C Hamano" : >>>  * 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 >>>

Re: [PATCH v2 01/10] ls-files: add --json to dump the index

2019-06-25 Thread Duy Nguyen
On Tue, Jun 25, 2019 at 2:15 AM Jeff Hostetler wrote: > > @@ -202,6 +202,28 @@ void jw_object_null(struct json_writer *jw, const char > > *key) > > strbuf_addstr(&jw->json, "null"); > > } > > > > +void jw_object_filemode(struct json_writer *jw, const char *key, mode_t > > mode) > > +{ >

  1   2   >