[PATCH 0/1] Fix a recently-introduced compile warning

2018-08-14 Thread Johannes Schindelin via GitGitGadget
With the relatively frequent breakages of pu recently, I had trouble staying on top of the compile errors/test failures, sorry. This one exists since Sunday, and it is a compile error only with DEVELOPER=1, which is, however, the recommended way to build in Git for Windows' SDK. Note: it is base

[PATCH 1/1] mark_colliding_entries(): fix incorrect #if...#endif guard

2018-08-14 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin The way the guard was put, the code was declaring an unused variable on Windows. No need to do that, so let's fix it. Signed-off-by: Johannes Schindelin --- entry.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/entry.c b/entry.c index c7034

[PATCH v3 5/7] submodule: use the 'submodule--helper config' command

2018-08-14 Thread Antonio Ospite
Use the 'submodule--helper config' command in git-submodules.sh to avoid referring explicitly to .gitmodules by the hardcoded file path. This makes it possible to access the submodules configuration in a more controlled way. Signed-off-by: Antonio Ospite --- git-submodule.sh | 8 1 fil

[PATCH v3 7/7] submodule: support reading .gitmodules even when it's not checked out

2018-08-14 Thread Antonio Ospite
When the .gitmodules file is not available in the working tree, try using HEAD:.gitmodules from the current branch. This covers the case when the file is part of the repository but for some reason it is not checked out, for example because of a sparse checkout. This makes it possible to use at lea

[PATCH v3 3/7] t7411: be nicer to future tests and really clean things up

2018-08-14 Thread Antonio Ospite
Tests 5 and 8 in t/t7411-submodule-config.sh add two commits with invalid lines in .gitmodules but then only the second commit is removed. This may affect future subsequent tests if they assume that the .gitmodules file has no errors. Remove both the commits as soon as they are not needed anymore

[PATCH v3 4/7] submodule--helper: add a new 'config' subcommand

2018-08-14 Thread Antonio Ospite
Add a new 'config' subcommand to 'submodule--helper', this extra level of indirection makes it possible to add some flexibility to how the submodules configuration is handled. Signed-off-by: Antonio Ospite --- builtin/submodule--helper.c | 14 ++ new | 0 t/t

[PATCH v3 0/7] Make submodules work if .gitmodules is not checked out

2018-08-14 Thread Antonio Ospite
Hi, this series teaches git to try and read the .gitmodules file from the current branch (HEAD:.gitmodules) when it's not readily available in the working tree. This can be used, along with sparse checkouts, to enable submodule usage with programs like vcsh[1] which manage multiple repositories w

[PATCH v3 2/7] submodule: factor out a config_set_in_gitmodules_file_gently function

2018-08-14 Thread Antonio Ospite
Introduce a new config_set_in_gitmodules_file_gently() function to write config values to the .gitmodules file. This is in preparation for a future change which will use the function to write to the .gitmodules file in a more controlled way instead of using "git config -f .gitmodules". The purpos

[PATCH v3 6/7] t7506: clean up .gitmodules properly before setting up new scenario

2018-08-14 Thread Antonio Ospite
In t/t7506-status-submodule.sh at some point a new scenario is set up to test different things, in particular new submodules are added which are meant to completely replace the previous ones. However before calling the "git submodule add" commands for the new layout, the .gitmodules file is remove

[PATCH v3 1/7] submodule: add a print_config_from_gitmodules() helper

2018-08-14 Thread Antonio Ospite
Add a new print_config_from_gitmodules() helper function to print values from .gitmodules just like "git config -f .gitmodules" would. This will be used by a new submodule--helper subcommand to be able to access the .gitmodules file in a more controlled way. Signed-off-by: Antonio Ospite --- su

[PATCH] t5310-pack-bitmaps: fix bogus 'pack-objects to file can use bitmap' test

2018-08-14 Thread SZEDER Gábor
The test 'pack-objects to file can use bitmap' added in 645c432d61 (pack-objects: use reachability bitmap index when generating non-stdout pack, 2016-09-10) is silently buggy and doesn't check what it's supposed to. In 't5310-pack-bitmaps.sh', the 'list_packed_objects' helper function does what it

[PATCH] doc: git-describe

2018-08-14 Thread William Pursell
commit cc4bd5268b2dbe90279198acb400a528ee23f5d5 Author: William Pursell Date: Tue Aug 14 06:41:00 2018 -0600 doc: Reference for --dirty/--broken diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt index e027fb8c4b..f7d67306c0 100644 --- a/Documentation/git-describ

Re: [PATCH] mingw: enable atomic O_APPEND

2018-08-14 Thread Jeff Hostetler
On 8/13/2018 3:02 PM, Johannes Sixt wrote: The Windows CRT implements O_APPEND "manually": on write() calls, the file pointer is set to EOF before the data is written. Clearly, this is not atomic. And in fact, this is the root cause of failures observed in t5552-skipping-fetch-negotiator.sh an

RE: Contributor Summit planning

2018-08-14 Thread Randall S. Becker
On August 14, 2018 2:53 AM, Elijah Newren wrote: > On Mon, Aug 13, 2018 at 10:27 AM Jeff King wrote: > > > > For the past several years, we've held a Git Contributor Summit as > > part of the Git Merge conference. I'd like to get opinions from the > > community to help plan future installments. An

Re: [PATCH] mingw: enable atomic O_APPEND

2018-08-14 Thread Ævar Arnfjörð Bjarmason
On Mon, Aug 13 2018, Jeff King wrote: > On Mon, Aug 13, 2018 at 11:22:10PM +0200, Ævar Arnfjörð Bjarmason wrote: > >> > O_APPEND is POSIX and means race-free append. If you mark some call >> > sites with O_APPEND, then that must be the ones that need race-free >> > append. Hence, you would have

Re: Contributor Summit planning

2018-08-14 Thread Ævar Arnfjörð Bjarmason
On Tue, Aug 14 2018, Randall S. Becker wrote: > On August 14, 2018 2:53 AM, Elijah Newren wrote: >> On Mon, Aug 13, 2018 at 10:27 AM Jeff King wrote: >> > >> > For the past several years, we've held a Git Contributor Summit as >> > part of the Git Merge conference. I'd like to get opinions from

Re: Contributor Summit planning

2018-08-14 Thread Jeff King
On Tue, Aug 14, 2018 at 09:25:41AM -0400, Randall S. Becker wrote: > Unrelated directly to above, I noticed that I actually showed up on > the list for 2018 based on git log anyway. Does this mean I'd be > welcome? Personally, it's actually easier to get approval to travel to > Brussels now than S

Re: Contributor Summit planning

2018-08-14 Thread Duy Nguyen
On Mon, Aug 13, 2018 at 11:06 PM Jeff King wrote: > > On Mon, Aug 13, 2018 at 01:41:51PM -0700, Stefan Beller wrote: > > > > Oh, using "git shortlog" might be also simpler ;-) > > > > I guess you'd need to memorize a different set of flags for that > > as without -s it would be harder to parse tha

Re: Contributor Summit planning

2018-08-14 Thread Jeff King
On Tue, Aug 14, 2018 at 04:06:23PM +0200, Ævar Arnfjörð Bjarmason wrote: > I very much regret sending that 'git log' command without some further > explanation. > > It was only meant as a *very* rough shortlist of people in the context > of a discussion of why some active contributors don't come

Re: Contributor Summit planning

2018-08-14 Thread Jeff King
On Tue, Aug 14, 2018 at 06:31:50AM +0200, Christian Couder wrote: > > We have been kicking around the thought of reviving the GitTogethers > > like back in the olden days (I only know them from hearsay), in > > Mountain View or Sunnyvale at the Google Campus, but we have not yet > > spent enough t

Re: [PATCH] mingw: enable atomic O_APPEND

2018-08-14 Thread Junio C Hamano
Jeff Hostetler writes: > On 8/13/2018 3:02 PM, Johannes Sixt wrote: >> >> Fortunately, Windows does support atomic O_APPEND semantics using the >> file access mode FILE_APPEND_DATA. Provide an implementation that does. >> ... >> >> Diagnosed-by: Johannes Schindelin >> Helped-by: Jeff Hostetler

Re: Contributor Summit planning

2018-08-14 Thread Jeff King
On Tue, Aug 14, 2018 at 04:30:09PM +0200, Duy Nguyen wrote: > > I frequently using "git shortlog -ns" to see who is active (especially > > coupled with "--since=". > > > > I also use "--no-merges", because it makes me look a lot better when > > compared relatively to Junio. :) > > --no-merges mak

Re: [PATCH] mingw: enable atomic O_APPEND

2018-08-14 Thread Jeff King
On Tue, Aug 14, 2018 at 03:47:54PM +0200, Ævar Arnfjörð Bjarmason wrote: > The relevant POSIX docs are here: > http://pubs.opengroup.org/onlinepubs/9699919799/functions/write.html > > Write requests of {PIPE_BUF} bytes or less shall not be interleaved > with data from other processes doin

Re: [PATCH v6 11/21] range-diff: add tests

2018-08-14 Thread Johannes Schindelin
Hi Thomas, On Mon, 13 Aug 2018, Thomas Gummerer wrote: > On 08/13, Thomas Rast via GitGitGadget wrote: > > From: Thomas Rast > > > > These are essentially lifted from https://github.com/trast/tbdiff, with > > light touch-ups to account for the command now being named `git > > range-diff`. > >

Re: [PATCH v6 11/21] range-diff: add tests

2018-08-14 Thread Jeff King
On Tue, Aug 14, 2018 at 04:53:51PM +0200, Johannes Schindelin wrote: > > > These are essentially lifted from https://github.com/trast/tbdiff, with > > > light touch-ups to account for the command now being named `git > > > range-diff`. > [...] > > Just noticed while reading the whole series again

Re: [PATCHv2 0/8] Resending sb/range-diff-colors

2018-08-14 Thread Johannes Schindelin
Hi Stefan, On Mon, 13 Aug 2018, Stefan Beller wrote: > This applies on top of js/range-diff (a7be92acd9600), this version > * resolves a semantic conflict in the test > (Did range-diff change its output slightly?) If by semantic conflict you mean... > 23: 6a1c7698c68 ! 23: 5701745379b t320

Re: [PATCH v6 11/21] range-diff: add tests

2018-08-14 Thread Jeff King
On Tue, Aug 14, 2018 at 11:03:10AM -0400, Jeff King wrote: > > Hmm. I hoped that my commit message was enough to indicate that while he > > is the author, I assembled this. Maybe I should move him to the footer, as > > an Original-Authored-By:? > > I think the "Author" field is actually distinct

Re: [PATCH 1/1] mark_colliding_entries(): fix incorrect #if...#endif guard

2018-08-14 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > From: Johannes Schindelin > > The way the guard was put, the code was declaring an unused variable on > Windows. No need to do that, so let's fix it. > > Signed-off-by: Johannes Schindelin > --- > entry.c | 6 +++--- > 1 file changed, 3 insertio

Re: [PATCH v3 5/5] list-objects-filter: implement filter tree:0

2018-08-14 Thread Jeff Hostetler
On 8/13/2018 2:14 PM, Matthew DeVore wrote: Teach list-objects the "tree:0" filter which allows for filtering out all tree and blob objects (unless other objects are explicitly specified by the user). The purpose of this patch is to allow smaller partial clones. The name of this filter - tree

Re: [PATCH v6 11/21] range-diff: add tests

2018-08-14 Thread Junio C Hamano
Johannes Schindelin writes: > Hmm. I hoped that my commit message was enough to indicate that while he > is the author, I assembled this. Maybe I should move him to the footer, as > an Original-Authored-By:? > > Junio? I think the log message gives a clear enough statement to credit the original

Re: [PATCH v2 3/5] rev-list: handle missing tree objects properly

2018-08-14 Thread Jonathan Tan
> I don't understand about the ">= 0". What should I replace it with? > Maybe you mean the return is never positive so I can change: > > parse_tree_gently(tree, 1) >= 0 > > to: > !parse_tree_gently(tree, 1) > > ? Sorry for the lack of clarity - that is what I meant. > > The missing mechanism (

Re: [PATCH] doc: git-describe

2018-08-14 Thread Junio C Hamano
William Pursell writes: > commit cc4bd5268b2dbe90279198acb400a528ee23f5d5 > Author: William Pursell > Date: Tue Aug 14 06:41:00 2018 -0600 > > doc: Reference for --dirty/--broken > Thanks for trying to help. Overall the resulting text does look much better than the original, but - "gi

Re: [PATCHv2 0/8] Resending sb/range-diff-colors

2018-08-14 Thread Stefan Beller
On Tue, Aug 14, 2018 at 8:05 AM Johannes Schindelin wrote: > > Hi Stefan, > > On Mon, 13 Aug 2018, Stefan Beller wrote: > > > This applies on top of js/range-diff (a7be92acd9600), this version > > * resolves a semantic conflict in the test > > (Did range-diff change its output slightly?) > > If

Re: Contributor Summit planning

2018-08-14 Thread Stefan Beller
On Tue, Aug 14, 2018 at 7:47 AM Jeff King wrote: > > One problem there is that the prefixes are ambiguous (e.g., Jacob Keller > shares with me, and I think at least one other over the years). You > could look at the author of the tip commit, but that's not always right > (and in fact, counting ju

Re: [PATCH v3 3/7] t7411: be nicer to future tests and really clean things up

2018-08-14 Thread Brandon Williams
On 08/14, Antonio Ospite wrote: > Tests 5 and 8 in t/t7411-submodule-config.sh add two commits with > invalid lines in .gitmodules but then only the second commit is removed. > > This may affect future subsequent tests if they assume that the > .gitmodules file has no errors. > > Remove both the

Re: [PATCH v3 4/7] submodule--helper: add a new 'config' subcommand

2018-08-14 Thread Brandon Williams
On 08/14, Antonio Ospite wrote: > Add a new 'config' subcommand to 'submodule--helper', this extra level > of indirection makes it possible to add some flexibility to how the > submodules configuration is handled. > > Signed-off-by: Antonio Ospite > --- > builtin/submodule--helper.c | 14 +++

Re: [PATCH v3 5/7] submodule: use the 'submodule--helper config' command

2018-08-14 Thread Brandon Williams
On 08/14, Antonio Ospite wrote: > Use the 'submodule--helper config' command in git-submodules.sh to avoid > referring explicitly to .gitmodules by the hardcoded file path. > > This makes it possible to access the submodules configuration in a more > controlled way. > > Signed-off-by: Antonio Osp

Re: [PATCH v3 7/7] submodule: support reading .gitmodules even when it's not checked out

2018-08-14 Thread Brandon Williams
On 08/14, Antonio Ospite wrote: > When the .gitmodules file is not available in the working tree, try > using HEAD:.gitmodules from the current branch. This covers the case > when the file is part of the repository but for some reason it is not > checked out, for example because of a sparse checkou

[PATCH v4 1/6] list-objects: store common func args in struct

2018-08-14 Thread Matthew DeVore
This will make utility functions easier to create, as done by the next patch. Signed-off-by: Matthew DeVore --- list-objects.c | 158 +++-- 1 file changed, 74 insertions(+), 84 deletions(-) diff --git a/list-objects.c b/list-objects.c index c99c47ac1.

[PATCH v4 2/6] list-objects: refactor to process_tree_contents

2018-08-14 Thread Matthew DeVore
This will be used in a follow-up patch to reduce indentation needed when invoking the logic conditionally. i.e. rather than: if (foo) { while (...) { /* this is very indented */ } } we will have: if (foo) process_tree_contents(...); Signed-off-by: Matthew

[PATCH v4 5/6] revision: mark non-user-given objects instead

2018-08-14 Thread Matthew DeVore
Currently, list-objects.c incorrectly treats all root trees of commits as USER_GIVEN. Also, it would be easier to mark objects that are non-user-given instead of user-given, since the places in the code where we access an object through a reference are more obvious than the places where we access a

[PATCH v4 4/6] rev-list: handle missing tree objects properly

2018-08-14 Thread Matthew DeVore
Previously, we assumed only blob objects could be missing. This patch makes rev-list handle missing trees like missing blobs. A missing tree will cause an error if --missing indicates an error should be caused, and the hash is printed even if the tree is missing. In list-objects.c we no longer pri

Measuring Community Involvement (was Re: Contributor Summit planning)

2018-08-14 Thread Derrick Stolee
On 8/13/2018 5:54 PM, Jeff King wrote: So I try not to think too hard on metrics, and just use them to get a rough view on who is active. I've been very interested in measuring community involvement, with the knowledge that any metric is flawed and we should not ever say "this metric is how w

Bug with Git submodules and submodule.recurse setting

2018-08-14 Thread Jochen Kühner
If I set    git config --global submodule.recurse true and run git via:   git pull --progress -v --no-rebase "origin" The command will fail with following output (Errorlevel is 1)   Fetching submodule submodules/tstemplates From http://10.0.102.194:7990/scm/mcc/tstemplates

Re: [PATCH 2/2] submodule: munge paths to submodule git directories

2018-08-14 Thread Brandon Williams
On 08/09, Jeff King wrote: > On Wed, Aug 08, 2018 at 03:33:23PM -0700, Brandon Williams wrote: > > > Commit 0383bbb901 (submodule-config: verify submodule names as paths, > > 2018-04-30) introduced some checks to ensure that submodule names don't > > include directory traversal components (e.g. ".

Re: [PATCH v4 4/6] rev-list: handle missing tree objects properly

2018-08-14 Thread Jonathan Tan
> Previously, we assumed only blob objects could be missing. This patch > makes rev-list handle missing trees like missing blobs. A missing tree > will cause an error if --missing indicates an error should be caused, > and the hash is printed even if the tree is missing. The last sentence is diffi

[PATCH v4 6/6] list-objects-filter: implement filter tree:0

2018-08-14 Thread Matthew DeVore
Teach list-objects the "tree:0" filter which allows for filtering out all tree and blob objects (unless other objects are explicitly specified by the user). The purpose of this patch is to allow smaller partial clones. The name of this filter - tree:0 - does not explicitly specify that it also fil

[PATCH v4 3/6] list-objects: always parse trees gently

2018-08-14 Thread Matthew DeVore
If parsing fails when revs->ignore_missing_links and revs->exclude_promisor_objects are both false, we print the OID anyway in the die("bad tree object...") call, so any message printed by parse_tree_gently() is superfluous. Signed-off-by: Matthew DeVore --- list-objects.c | 4 +--- 1 file chang

[PATCH v4 0/6] filter: support for excluding all trees and blobs

2018-08-14 Thread Matthew DeVore
I've applied or responded to all changes suggested by Jonathan and Jeff. Matthew DeVore (6): list-objects: store common func args in struct list-objects: refactor to process_tree_contents list-objects: always parse trees gently rev-list: handle missing tree objects properly revision: mar

Re: [PATCH v3 5/5] list-objects-filter: implement filter tree:0

2018-08-14 Thread Matthew DeVore
On Tue, Aug 14, 2018 at 8:13 AM Jeff Hostetler wrote: > > > > On 8/13/2018 2:14 PM, Matthew DeVore wrote: > > Teach list-objects the "tree:0" filter which allows for filtering > > out all tree and blob objects (unless other objects are explicitly > > specified by the user). The purpose of this pat

[PATCH 0/4] finishing touches on jk/for-each-object-iteration

2018-08-14 Thread Jeff King
On Mon, Aug 13, 2018 at 11:45:06AM -0700, Jonathan Tan wrote: > > [1/7]: for_each_*_object: store flag definitions in a single location > > [2/7]: for_each_*_object: take flag arguments as enum > > [3/7]: for_each_*_object: give more comprehensive docstrings > > [4/7]: for_each_packed_obje

[PATCH 1/4] cat-file: use oidset check-and-insert

2018-08-14 Thread Jeff King
We don't need to check if the oidset has our object before we insert it; that's done as part of the insertion. We can just rely on the return value from oidset_insert(), which saves one hash lookup per object. This measurable speedup is tiny and within the run-to-run noise, but the result is simpl

[PATCH v2] send-email: add an option to impose delay sent E-Mails

2018-08-14 Thread Ævar Arnfjörð Bjarmason
Add a --send-delay option with a corresponding sendemail.smtpSendDelay configuration variable. When set to e.g. 2, this causes send-email to sleep 2 seconds before sending the next E-Mail. We'll only sleep between sends, not before the first send, or after the last. This option has two uses. First

[PATCH 2/4] cat-file: split batch "buf" into two variables

2018-08-14 Thread Jeff King
We use the "buf" strbuf for two things: to read incoming lines, and as a scratch space for test-expanding the user-provided format. Let's split this into two variables with descriptive names, which makes their purpose and lifetime more clear. It will also help in a future patch when we start using

Re: [PATCH v4 6/6] list-objects-filter: implement filter tree:0

2018-08-14 Thread Jonathan Tan
> @@ -743,6 +743,9 @@ specification contained in . > A debug option to help with future "partial clone" development. > This option specifies how missing objects are handled. > + > +The form '--filter=tree:' omits all blobs and trees deeper than > + from the root tree. Currently, only =

Re: [PATCH v4 2/5] unpack-trees: add performance tracing

2018-08-14 Thread Jeff Hostetler
On 8/13/2018 6:41 PM, Junio C Hamano wrote: Jeff King writes: I can buy the argument that it's nice to have some form of profiling that works everywhere, even if it's lowest-common-denominator. I just wonder if we could be investing effort into tooling around existing solutions that will en

[PATCH 3/4] cat-file: use a single strbuf for all output

2018-08-14 Thread Jeff King
When we're in batch mode, we end up in batch_object_write() for each object, which allocates its own strbuf for each call. Instead, we can provide a single "scratch" buffer that gets reused for each output. When running: git cat-file --batch-all-objects --batch-check='%(objectname)' on git.git,

[PATCH 4/4] for_each_*_object: move declarations to object-store.h

2018-08-14 Thread Jeff King
The for_each_loose_object() and for_each_packed_object() functions are meant to be part of a unified interface: they use the same set of for_each_object_flags, and it's not inconceivable that we might one day add a single for_each_object() wrapper around them. Let's put them together in a single f

[PATCH] git-submodule.sh: accept verbose flag in cmd_update to be non-quiet

2018-08-14 Thread Stefan Beller
In a56771a668d (builtin/pull: respect verbosity settings in submodules, 2018-01-25), we made sure to pass on both quiet and verbose flag from builtin/pull.c to the submodule shell script. However git-submodule doesn't understand a verbose flag, which results in a bug when invoking git pull --rec

Re: [PATCH] git-submodule.sh: accept verbose flag in cmd_update to be non-quiet

2018-08-14 Thread Jonathan Nieder
Stefan Beller wrote: > git-submodule.sh | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/git-submodule.sh b/git-submodule.sh > index 8b5ad59bdee..f7fd80345cd 100755 > --- a/git-submodule.sh > +++ b/git-submodule.sh > @@ -438,6 +438,9 @@ cmd_update() > -q|--quiet) >

Re: [PATCH] mingw: enable atomic O_APPEND

2018-08-14 Thread Johannes Sixt
Am 14.08.2018 um 00:37 schrieb Jeff King: And then you can do something like: for size in 4097 8193 16385 32769 65537 131073 262145 524289 1048577; do >out ;# clean up from last run echo "Trying $size..." timeout 5 ./write $size out if ! ./check $size I used your program

Re: [PATCH v4 2/5] unpack-trees: add performance tracing

2018-08-14 Thread Duy Nguyen
On Tue, Aug 14, 2018 at 8:19 PM Jeff Hostetler wrote: > I'm looking at adding code to my SLOG (better name suggestions welcome) > patch series to eventually replace the existing git_trace facility. Complement maybe. Replace, please no. I'd rather not stare at json messages. -- Duy

Re: [PATCH v2] send-email: add an option to impose delay sent E-Mails

2018-08-14 Thread Stefan Beller
On Tue, Aug 14, 2018 at 11:15 AM Ævar Arnfjörð Bjarmason wrote: > > Add a --send-delay option with a corresponding sendemail.smtpSendDelay > configuration variable. When set to e.g. 2, this causes send-email to > sleep 2 seconds before sending the next E-Mail. We'll only sleep > between sends, not

Re: [PATCH v4 2/5] unpack-trees: add performance tracing

2018-08-14 Thread Stefan Beller
On Tue, Aug 14, 2018 at 11:32 AM Duy Nguyen wrote: > > On Tue, Aug 14, 2018 at 8:19 PM Jeff Hostetler wrote: > > I'm looking at adding code to my SLOG (better name suggestions welcome) > > patch series to eventually replace the existing git_trace facility. > > Complement maybe. Replace, please no

Re: [PATCH v2] send-email: add an option to impose delay sent E-Mails

2018-08-14 Thread Eric Wong
Ævar Arnfjörð Bjarmason wrote: > Add a --send-delay option with a corresponding sendemail.smtpSendDelay > configuration variable. When set to e.g. 2, this causes send-email to > sleep 2 seconds before sending the next E-Mail. We'll only sleep > between sends, not before the first send, or after th

Re: [PATCH v4 2/5] unpack-trees: add performance tracing

2018-08-14 Thread Duy Nguyen
On Tue, Aug 14, 2018 at 8:44 PM Stefan Beller wrote: > > On Tue, Aug 14, 2018 at 11:32 AM Duy Nguyen wrote: > > > > On Tue, Aug 14, 2018 at 8:19 PM Jeff Hostetler > > wrote: > > > I'm looking at adding code to my SLOG (better name suggestions welcome) > > > patch series to eventually replace th

Re: [PATCH 4/4] range-diff: indent special lines as context

2018-08-14 Thread Johannes Schindelin
Hi Stefan, On Mon, 13 Aug 2018, Stefan Beller wrote: > > > The later lines that indicate a change to the Makefile will be treated as > > > context both in the outer and inner diff, such that those lines stay > > > regular color. > > > > While I am a fan of having those lines colored correctly, I

Re: [PATCH 2/2] submodule: munge paths to submodule git directories

2018-08-14 Thread Jeff King
On Tue, Aug 14, 2018 at 11:04:06AM -0700, Brandon Williams wrote: > > I think this backwards-compatibility is necessary to avoid pain. But > > until it goes away, I don't think this is helping the vulnerability from > > 0383bbb901. Because there the issue was that the submodule name pointed > > ba

Re: [PATCH 2/2] submodule: munge paths to submodule git directories

2018-08-14 Thread Jonathan Nieder
Hi, Brandon Williams wrote: > On 08/09, Jeff King wrote: >> One interesting thing about url-encoding is that it's not one-to-one. >> This case could also be %2F, which is a different file (on a >> case-sensitive filesystem). I think "%20" and "+" are similarly >> interchangeable. >> >> If we were

[PATCH] submodule: add more exhaustive up-path testing

2018-08-14 Thread Ævar Arnfjörð Bjarmason
The tests added in 63e95beb08 ("submodule: port resolve_relative_url from shell to C", 2016-04-15) didn't do a good job of testing various up-path invocations where the up-path would bring us beyond even the URL in question without emitting an error. These results look nonsensical, but it's worth

Re: [PATCH 4/4] range-diff: indent special lines as context

2018-08-14 Thread Stefan Beller
On Tue, Aug 14, 2018 at 11:54 AM Johannes Schindelin wrote: > > Hi Stefan, > > On Mon, 13 Aug 2018, Stefan Beller wrote: > > > > > The later lines that indicate a change to the Makefile will be treated > > > > as > > > > context both in the outer and inner diff, such that those lines stay > > > >

Re: [PATCH] submodule: add more exhaustive up-path testing

2018-08-14 Thread Stefan Beller
On Tue, Aug 14, 2018 at 11:59 AM Ævar Arnfjörð Bjarmason wrote: > > The tests added in 63e95beb08 ("submodule: port resolve_relative_url > from shell to C", 2016-04-15) didn't do a good job of testing various > up-path invocations where the up-path would bring us beyond even the > URL in question

Re: [PATCH] mingw: enable atomic O_APPEND

2018-08-14 Thread Jeff King
On Tue, Aug 14, 2018 at 08:29:04PM +0200, Johannes Sixt wrote: > Am 14.08.2018 um 00:37 schrieb Jeff King: > > And then you can do something like: > > > >for size in 4097 8193 16385 32769 65537 131073 262145 524289 1048577; do > > >out ;# clean up from last run > > echo "Trying $siz

Re: [PATCH v4 0/5] Speed up unpack_trees()

2018-08-14 Thread Ben Peart
On 8/12/2018 4:15 AM, Nguyễn Thái Ngọc Duy wrote: v4 has a bunch of changes - 1/5 is a new one to show indented tracing. This way it's less misleading to read nested time measurements - 3/5 now has the switch/restore cache_bottom logic. Junio suggested a check instead in his final note,

Re: [PATCH 3/4] cat-file: use a single strbuf for all output

2018-08-14 Thread René Scharfe
Am 14.08.2018 um 20:20 schrieb Jeff King: > When we're in batch mode, we end up in batch_object_write() > for each object, which allocates its own strbuf for each > call. Instead, we can provide a single "scratch" buffer that > gets reused for each output. When running: > > git cat-file --batch-

Re: Measuring Community Involvement (was Re: Contributor Summit planning)

2018-08-14 Thread Jeff King
On Tue, Aug 14, 2018 at 01:43:38PM -0400, Derrick Stolee wrote: > On 8/13/2018 5:54 PM, Jeff King wrote: > > So I try not to think too hard on metrics, and just use them to get a > > rough view on who is active. > > I've been very interested in measuring community involvement, with the > knowledg

Re: [PATCH 3/4] cat-file: use a single strbuf for all output

2018-08-14 Thread Jeff King
On Tue, Aug 14, 2018 at 09:30:57PM +0200, René Scharfe wrote: > > -static void batch_object_write(const char *obj_name, struct batch_options > > *opt, > > +static void batch_object_write(const char *obj_name, > > + struct strbuf *scratch, > > + st

Re: Measuring Community Involvement (was Re: Contributor Summit planning)

2018-08-14 Thread Stefan Beller
On Tue, Aug 14, 2018 at 12:36 PM Jeff King wrote: > Thanks, it was nice to see a more comprehensive list in one spot. > > It would be neat to have a tool that presents all of these > automatically, but I think the email ones are pretty tricky (most people > don't have the whole list archive sitti

Re: [PATCH v2] send-email: add an option to impose delay sent E-Mails

2018-08-14 Thread Junio C Hamano
Eric Wong writes: >> Some popular E-Mail clients completely ignore the "Date" header, which >> format-patch is careful to set such that the patches will be displayed >> in order, and instead sort by the time the E-mail was received. It is send-email that carefully shows monotonically increasing

Re: [PATCH] submodule: add more exhaustive up-path testing

2018-08-14 Thread Junio C Hamano
Stefan Beller writes: > Thanks for this patch! > Stefan Thanks, I'd take it as your Acked-by: (please holler if it isn't before the patch hits 'next').

Re: [PATCH v4 2/5] unpack-trees: add performance tracing

2018-08-14 Thread Jeff King
On Tue, Aug 14, 2018 at 08:51:41PM +0200, Duy Nguyen wrote: > > But AFAICT these series are all about putting the sampling points into the > > code base, so formatting would be orthogonal to it? > > It's not just sampling points. There's things like index id being > shown in the message for examp

Re: [PATCH v4 6/6] list-objects-filter: implement filter tree:0

2018-08-14 Thread Matthew DeVore
On Tue, Aug 14, 2018 at 11:18 AM Jonathan Tan wrote: > > > @@ -743,6 +743,9 @@ specification contained in . > > A debug option to help with future "partial clone" development. > > This option specifies how missing objects are handled. > > + > > +The form '--filter=tree:' omits all blo

Re: [PATCH v4 6/6] list-objects-filter: implement filter tree:0

2018-08-14 Thread Jeff King
On Tue, Aug 14, 2018 at 10:28:13AM -0700, Matthew DeVore wrote: > The name "tree:0" allows later filtering based on depth, i.e. "tree:1" > would filter out all but the root tree and blobs. In order to avoid > confusion between 0 and capital O, the documentation was worded in a > somewhat round-abo

Re: Measuring Community Involvement (was Re: Contributor Summit planning)

2018-08-14 Thread Jeff King
On Tue, Aug 14, 2018 at 12:47:59PM -0700, Stefan Beller wrote: > On Tue, Aug 14, 2018 at 12:36 PM Jeff King wrote: > > > Thanks, it was nice to see a more comprehensive list in one spot. > > > > It would be neat to have a tool that presents all of these > > automatically, but I think the email o

Syncing HEAD

2018-08-14 Thread Christian Couder
Hi, When cloning with --mirror, the clone gets its HEAD initialized with the value HEAD has in its origin remote. After that if HEAD changes in origin there is no simple way to sync HEAD at the same time as the refs are synced. It looks like the simplest way to sync HEAD is: 1) git remote show o

Re: [PATCH v4 2/5] unpack-trees: add performance tracing

2018-08-14 Thread Jeff Hostetler
On 8/14/2018 2:44 PM, Stefan Beller wrote: On Tue, Aug 14, 2018 at 11:32 AM Duy Nguyen wrote: On Tue, Aug 14, 2018 at 8:19 PM Jeff Hostetler wrote: I'm looking at adding code to my SLOG (better name suggestions welcome) patch series to eventually replace the existing git_trace facility.

Re: [PATCH v3 3/7] t7411: be nicer to future tests and really clean things up

2018-08-14 Thread Junio C Hamano
Antonio Ospite writes: > test_expect_success 'error message contains blob reference' ' > + # Remove the error introduced in the previous test. > + # It is not needed in the following tests. > + test_when_finished "git -C super reset --hard HEAD^" && > (cd super && >

Re: [PATCH v4 6/6] list-objects-filter: implement filter tree:0

2018-08-14 Thread Jonathan Tan
> - grep -E "tree|blob" objs >trees_and_blobs && > - test_line_count = 1 trees_and_blobs > + grep -E "tree|blob" objs \ > + | awk -f print_1.awk >trees_and_blobs && > + git -C r1 rev-parse HEAD: >expected && > + test_cmp trees_and_blobs expected Indent "| awk" (and similar lines in this patch) - a

Re: [PATCH v3 7/7] submodule: support reading .gitmodules even when it's not checked out

2018-08-14 Thread Junio C Hamano
Antonio Ospite writes: > /* Equivalent to ACTION_SET in builtin/config.c */ > - if (argc == 3) > + if (argc == 3) { > + struct object_id oid; > + > + /* > + * If the .gitmodules file is not in the working tree but it > + * is in the

Re: Measuring Community Involvement (was Re: Contributor Summit planning)

2018-08-14 Thread Junio C Hamano
Jeff King writes: > On Tue, Aug 14, 2018 at 01:43:38PM -0400, Derrick Stolee wrote: > >> On 8/13/2018 5:54 PM, Jeff King wrote: >> > So I try not to think too hard on metrics, and just use them to get a >> > rough view on who is active. >> >> I've been very interested in measuring community invo

Re: [PATCH v4 2/5] unpack-trees: add performance tracing

2018-08-14 Thread Junio C Hamano
Duy Nguyen writes: > These trace messages are made for human consumption. Granted > occasionally we need some processing but I find one liners mostly > suffice. Now we turn these into something made for machines, turning > people to second citizens. I've read these messages reformatted for > huma

Re: [PATCH v4 6/6] list-objects-filter: implement filter tree:0

2018-08-14 Thread Junio C Hamano
Jonathan Tan writes: >> - grep -E "tree|blob" objs >trees_and_blobs && >> - test_line_count = 1 trees_and_blobs >> + grep -E "tree|blob" objs \ >> + | awk -f print_1.awk >trees_and_blobs && >> + git -C r1 rev-parse HEAD: >expected && >> + test_cmp trees_and_blobs expected > > Indent "| awk" (and

Re: Syncing HEAD

2018-08-14 Thread Stefan Beller
On Tue, Aug 14, 2018 at 1:09 PM Christian Couder wrote: > > Hi, > > When cloning with --mirror, the clone gets its HEAD initialized with > the value HEAD has in its origin remote. After that if HEAD changes in > origin there is no simple way to sync HEAD at the same time as the > refs are synced.

Re: Contributor Summit planning

2018-08-14 Thread Junio C Hamano
Jeff King writes: > One problem there is that the prefixes are ambiguous (e.g., Jacob Keller > shares with me, and I think at least one other over the years). You > could look at the author of the tip commit, but that's not always right > (and in fact, counting just merged topics misses bug-fixes

Re: [PATCH 0/7] Resend of sb/submodule-update-in-c

2018-08-14 Thread Junio C Hamano
Stefan Beller writes: > Thanks Brandon for pointing out to use repo_git_path instead of > manually constructing the path. > > That is the only change in this resend. Rcpt. Hopefully this is now ready for 'next'?

Re: [PATCH v2] send-email: add an option to impose delay sent E-Mails

2018-08-14 Thread Ævar Arnfjörð Bjarmason
On Tue, Aug 14 2018, Eric Wong wrote: > Ævar Arnfjörð Bjarmason wrote: >> Add a --send-delay option with a corresponding sendemail.smtpSendDelay >> configuration variable. When set to e.g. 2, this causes send-email to >> sleep 2 seconds before sending the next E-Mail. We'll only sleep >> betwee

Re: [PATCH] submodule: add more exhaustive up-path testing

2018-08-14 Thread Ævar Arnfjörð Bjarmason
On Tue, Aug 14 2018, Stefan Beller wrote: > On Tue, Aug 14, 2018 at 11:59 AM Ævar Arnfjörð Bjarmason > wrote: >> >> The tests added in 63e95beb08 ("submodule: port resolve_relative_url >> from shell to C", 2016-04-15) didn't do a good job of testing various >> up-path invocations where the up-p

Re: Syncing HEAD

2018-08-14 Thread Jeff King
On Tue, Aug 14, 2018 at 10:09:37PM +0200, Christian Couder wrote: > When cloning with --mirror, the clone gets its HEAD initialized with > the value HEAD has in its origin remote. After that if HEAD changes in > origin there is no simple way to sync HEAD at the same time as the > refs are synced.

Re: [PATCH 2/2] submodule: munge paths to submodule git directories

2018-08-14 Thread Stefan Beller
On Tue, Aug 14, 2018 at 11:57 AM Jonathan Nieder wrote: > > Hi, > > Brandon Williams wrote: > > On 08/09, Jeff King wrote: > > >> One interesting thing about url-encoding is that it's not one-to-one. > >> This case could also be %2F, which is a different file (on a > >> case-sensitive filesystem).

Re: Syncing HEAD

2018-08-14 Thread Brandon Williams
On 08/14, Stefan Beller wrote: > On Tue, Aug 14, 2018 at 1:09 PM Christian Couder > wrote: > > > > Hi, > > > > When cloning with --mirror, the clone gets its HEAD initialized with > > the value HEAD has in its origin remote. After that if HEAD changes in > > origin there is no simple way to sync H

  1   2   >