Re: [PATCH v2] fetch-pack: don't try to fetch peel values with --all

2018-06-13 Thread Kirill Smelkov
On Wed, Jun 13, 2018 at 05:13:02PM -0400, Jeff King wrote: > On Tue, Jun 12, 2018 at 06:54:17PM +, Kirill Smelkov wrote: > > > > If an extra connection isn't a problem, you might be better off with > > > "git ls-remote", and then picking through the results for refs of > > > interest, and

Re: [PATCH] fetch-pack: test explicitly that --all can fetch tag references pointing to non-commits

2018-06-13 Thread Kirill Smelkov
On Wed, Jun 13, 2018 at 07:11:47PM -0400, Jeff King wrote: > On Wed, Jun 13, 2018 at 05:05:09PM -0400, Jeff King wrote: > > > > In order to be sure fetching funky tags will never break, let's > > > explicitly test all relevant cases with 4 tag objects pointing to 1) a > > > blob, 2) a tree, 3) a

' Prize

2018-06-13 Thread ''INTERNET''
USA Internet Command Protocol 2018 has selected your e-mail ID as a lucky winner of US $ 2.5 million out of US $ 350,000,000.00 shared worldwide for 1,600,000 e-mails users. Forward to this e-mail: m...@yahoo.com , your -Full name: Address: Mobile: Country: Winning code:USAL-q25M112233325

Re: [PATCH v2 00/31] object-store: lookup_commit

2018-06-13 Thread Derrick Stolee
On 6/13/2018 9:23 PM, Derrick Stolee wrote: On 6/13/2018 7:04 PM, Stefan Beller wrote * Once this is in good shape we can talk about converting parts of the revision    walking code, This is another reason why I'll be waiting for this series of series. I plan to rework the revision

[PATCH v2] doc: update the order of the syntax `git merge --continue`

2018-06-13 Thread Meng-Sung Wu
The syntax "git merge HEAD " has been removed. The order of the syntax should also be updated. Signed-off-by: Meng-Sung Wu --- Documentation/git-merge.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index

Re: [PATCH v2 00/31] object-store: lookup_commit

2018-06-13 Thread Derrick Stolee
On 6/13/2018 7:04 PM, Stefan Beller wrote * Once this is in good shape we can talk about converting parts of the revision walking code, This is another reason why I'll be waiting for this series of series. I plan to rework the revision walking code around sort_in_topological_order(), but

Re: [PATCH 03/35] object: add repository argument to lookup_unknown_object

2018-06-13 Thread Derrick Stolee
On 6/13/2018 3:30 PM, Stefan Beller wrote: On Wed, Jun 6, 2018 at 12:38 PM Duy Nguyen wrote: On Wed, May 30, 2018 at 2:47 AM, Stefan Beller wrote: diff --git a/object.c b/object.c index 4de4fa58d59..def3c71cac2 100644 --- a/object.c +++ b/object.c @@ -177,7 +177,7 @@ void

Re: [PATCH 01/10] t: add tool to translate hash-related values

2018-06-13 Thread brian m. carlson
On Tue, Jun 12, 2018 at 03:29:47AM -0400, Eric Sunshine wrote: > On Mon, Jun 11, 2018 at 9:05 PM, brian m. carlson > wrote: > > test_oid would be fine. One note is that this doesn't always produce > > OIDs; sometimes it will produce other values, but as long as you don't > > think that's too

Re: Hash algorithm analysis

2018-06-13 Thread brian m. carlson
On Tue, Jun 12, 2018 at 06:21:21PM +0200, Gilles Van Assche wrote: > Hi, > > On 10/06/18 00:49, brian m. carlson wrote: > > I imported the optimized 64-bit implementation of KangarooTwelve. The > > AVX2 implementation was not considered for licensing reasons (it's > > partially generated from

Re: [PATCH] fetch-pack: test explicitly that --all can fetch tag references pointing to non-commits

2018-06-13 Thread Jeff King
On Wed, Jun 13, 2018 at 05:05:09PM -0400, Jeff King wrote: > > In order to be sure fetching funky tags will never break, let's > > explicitly test all relevant cases with 4 tag objects pointing to 1) a > > blob, 2) a tree, 3) a commit, and 4) another tag objects. The referenced > > tag objects

[PATCH v2 21/31] tag: allow parse_tag_buffer to handle arbitrary repositories

2018-06-13 Thread Stefan Beller
Signed-off-by: Stefan Beller --- tag.c | 10 +- tag.h | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/tag.c b/tag.c index 46b5882ee12..682e7793059 100644 --- a/tag.c +++ b/tag.c @@ -126,7 +126,7 @@ void release_tag_memory(struct tag *t) t->date = 0; }

[PATCH v2 20/31] tag: allow lookup_tag to handle arbitrary repositories

2018-06-13 Thread Stefan Beller
Signed-off-by: Stefan Beller --- tag.c | 10 +- tag.h | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/tag.c b/tag.c index fbb4659325b..46b5882ee12 100644 --- a/tag.c +++ b/tag.c @@ -92,13 +92,13 @@ struct object *deref_tag_noverify(struct object *o)

[PATCH v2 28/31] object.c: allow parse_object to handle arbitrary repositories

2018-06-13 Thread Stefan Beller
Signed-off-by: Stefan Beller --- object.c | 14 +++--- object.h | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/object.c b/object.c index b63a51febd4..62df8e11b63 100644 --- a/object.c +++ b/object.c @@ -245,28 +245,28 @@ struct object *parse_object_or_die(const

[PATCH v2 11/31] commit: add repository argument to get_cached_commit_buffer

2018-06-13 Thread Stefan Beller
Add a repository argument to allow callers of get_cached_commit_buffer to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to

[PATCH v2 19/31] commit: allow lookup_commit to handle arbitrary repositories

2018-06-13 Thread Stefan Beller
Signed-off-by: Stefan Beller --- commit.c | 10 +- commit.h | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/commit.c b/commit.c index ede31c46931..4b10e7173b5 100644 --- a/commit.c +++ b/commit.c @@ -52,13 +52,13 @@ struct commit *lookup_commit_or_die(const

[PATCH v2 30/31] commit.c: allow lookup_commit_reference_gently to handle arbitrary repositories

2018-06-13 Thread Stefan Beller
Signed-off-by: Stefan Beller --- commit.c | 8 commit.h | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/commit.c b/commit.c index 7ee55f6b8f0..009e1d33e08 100644 --- a/commit.c +++ b/commit.c @@ -23,16 +23,16 @@ int save_commit_buffer = 1; const char

[PATCH v2 23/31] commit-slabs: remove realloc counter outside of slab struct

2018-06-13 Thread Stefan Beller
The realloc counter is declared outside the struct for the given slabname, which makes it harder for a follow up patch to move the declaration of the struct around as then the counter variable would need special treatment. As the reallocation counter is currently unused we can just remove it. If

[PATCH v2 27/31] object.c: allow parse_object_buffer to handle arbitrary repositories

2018-06-13 Thread Stefan Beller
Signed-off-by: Stefan Beller --- object.c | 18 +- object.h | 3 +-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/object.c b/object.c index 7a7b078e4d0..b63a51febd4 100644 --- a/object.c +++ b/object.c @@ -185,21 +185,21 @@ struct object

[PATCH v2 22/31] commit.c: allow parse_commit_buffer to handle arbitrary repositories

2018-06-13 Thread Stefan Beller
Signed-off-by: Stefan Beller --- commit.c | 10 +- commit.h | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/commit.c b/commit.c index 4b10e7173b5..fe3b6ff216f 100644 --- a/commit.c +++ b/commit.c @@ -335,7 +335,7 @@ const void *detach_commit_buffer(struct commit

[PATCH v2 24/31] commit.c: migrate the commit buffer to the parsed object store

2018-06-13 Thread Stefan Beller
Signed-off-by: Stefan Beller --- commit.c | 29 +++-- commit.h | 4 object.c | 5 + object.h | 4 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/commit.c b/commit.c index fe3b6ff216f..e9b22268997 100644 --- a/commit.c +++ b/commit.c @@

[PATCH v2 26/31] commit.c: allow get_cached_commit_buffer to handle arbitrary repositories

2018-06-13 Thread Stefan Beller
Signed-off-by: Stefan Beller --- commit.c | 4 ++-- commit.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/commit.c b/commit.c index 44d1a38187a..7ee55f6b8f0 100644 --- a/commit.c +++ b/commit.c @@ -270,10 +270,10 @@ void set_commit_buffer(struct repository *r, struct

[PATCH v2 31/31] commit.c: allow lookup_commit_reference to handle arbitrary repositories

2018-06-13 Thread Stefan Beller
Signed-off-by: Stefan Beller --- commit.c | 4 ++-- commit.h | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/commit.c b/commit.c index 009e1d33e08..7b60e0cb030 100644 --- a/commit.c +++ b/commit.c @@ -35,9 +35,9 @@ struct commit *lookup_commit_reference_gently(struct

[PATCH v2 29/31] tag.c: allow deref_tag to handle arbitrary repositories

2018-06-13 Thread Stefan Beller
Signed-off-by: Stefan Beller --- tag.c | 5 ++--- tag.h | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tag.c b/tag.c index 682e7793059..94a89b21cb5 100644 --- a/tag.c +++ b/tag.c @@ -64,12 +64,11 @@ int gpg_verify_tag(const struct object_id *oid, const char

[PATCH v2 25/31] commit.c: allow set_commit_buffer to handle arbitrary repositories

2018-06-13 Thread Stefan Beller
Signed-off-by: Stefan Beller --- commit.c | 4 ++-- commit.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/commit.c b/commit.c index e9b22268997..44d1a38187a 100644 --- a/commit.c +++ b/commit.c @@ -262,10 +262,10 @@ void free_commit_buffer_slab(struct buffer_slab *bs)

[PATCH v2 09/31] commit: add repository argument to parse_commit_buffer

2018-06-13 Thread Stefan Beller
Add a repository argument to allow the callers of parse_commit_buffer to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to

[PATCH v2 16/31] object: allow lookup_object to handle arbitrary repositories

2018-06-13 Thread Stefan Beller
Signed-off-by: Jonathan Nieder Signed-off-by: Stefan Beller --- object.c | 15 +++ object.h | 3 +-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/object.c b/object.c index 876ca4977e2..c1c1cbc1f53 100644 --- a/object.c +++ b/object.c @@ -84,21 +84,20 @@ static

[PATCH v2 13/31] tag: add repository argument to parse_tag_buffer

2018-06-13 Thread Stefan Beller
Add a repository argument to allow the callers of parse_tag_buffer to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch

[PATCH v2 07/31] commit: add repository argument to lookup_commit_reference

2018-06-13 Thread Stefan Beller
Add a repository argument to allow callers of lookup_commit_reference to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to

[PATCH v2 12/31] tag: add repository argument to lookup_tag

2018-06-13 Thread Stefan Beller
Add a repository argument to allow the callers of lookup_tag to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch

[PATCH v2 08/31] commit: add repository argument to lookup_commit

2018-06-13 Thread Stefan Beller
Add a repository argument to allow callers of lookup_commit to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch

[PATCH v2 10/31] commit: add repository argument to set_commit_buffer

2018-06-13 Thread Stefan Beller
Add a repository argument to allow callers of set_commit_buffer to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch

[PATCH v2 15/31] object: allow object_as_type to handle arbitrary repositories

2018-06-13 Thread Stefan Beller
Signed-off-by: Stefan Beller --- object.c | 4 ++-- object.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/object.c b/object.c index c6779ee596f..876ca4977e2 100644 --- a/object.c +++ b/object.c @@ -158,13 +158,13 @@ void *create_object(struct repository *r, const

[PATCH v2 17/31] blob: allow lookup_blob to handle arbitrary repositories

2018-06-13 Thread Stefan Beller
Signed-off-by: Stefan Beller --- blob.c | 10 +- blob.h | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/blob.c b/blob.c index 17b9314f0a0..342bdbb1bbe 100644 --- a/blob.c +++ b/blob.c @@ -5,13 +5,13 @@ const char *blob_type = "blob"; -struct blob

[PATCH v2 14/31] tag: add repository argument to deref_tag

2018-06-13 Thread Stefan Beller
Add a repository argument to allow the callers of deref_tag to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch

[PATCH v2 18/31] tree: allow lookup_tree to handle arbitrary repositories

2018-06-13 Thread Stefan Beller
Signed-off-by: Stefan Beller --- tree.c | 10 +- tree.h | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/tree.c b/tree.c index 33063b8dde0..2bffc0714a8 100644 --- a/tree.c +++ b/tree.c @@ -195,13 +195,13 @@ int read_tree(struct tree *tree, int stage, struct

[PATCH v2 01/31] object: add repository argument to lookup_object

2018-06-13 Thread Stefan Beller
Add a repository argument to allow callers of lookup_object to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch

[PATCH v2 04/31] blob: add repository argument to lookup_blob

2018-06-13 Thread Stefan Beller
Add a repository argument to allow the callers of lookup_blob to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch

[PATCH v2 06/31] commit: add repository argument to lookup_commit_reference_gently

2018-06-13 Thread Stefan Beller
Add a repository argument to allow callers of lookup_commit_reference_gently to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a

[PATCH v2 00/31] object-store: lookup_commit

2018-06-13 Thread Stefan Beller
* removed mentions of cooci patches * added forward declaration of commit buffer slabs. * dropped 3 patches that add the repository to lookup_unkonwn_object, parse_commit and parse_commit_gently, but were not converting those functions. We'll convert these in the next series, as this series is

[PATCH v2 03/31] object: add repository argument to object_as_type

2018-06-13 Thread Stefan Beller
Signed-off-by: Stefan Beller --- blob.c | 2 +- builtin/fsck.c | 2 +- commit.c | 4 ++-- object.c | 2 +- object.h | 3 ++- refs.c | 2 +- tag.c | 2 +- tree.c | 2 +- 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/blob.c

[PATCH v2 02/31] object: add repository argument to parse_object_buffer

2018-06-13 Thread Stefan Beller
Add a repository argument to allow the callers of parse_object_buffer to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to

[PATCH v2 05/31] tree: add repository argument to lookup_tree

2018-06-13 Thread Stefan Beller
Add a repository argument to allow the callers of lookup_tree to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch

Re: [PATCH 19/20] abbrev: support relative abbrev values

2018-06-13 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > E.g. here's a breakdown of my dotfiles repo: > > $ git -c core.abbrev=4 log --pretty=format:%h|perl -nE 'chomp;say > length'|sort|uniq -c|sort -nr > 784 4 > 59 5 > 7 6 > > I don't have a single commit that needs 7 characters, yet

Re: [GSoC] GSoC with git, week 6

2018-06-13 Thread Paul-Sebastian Ungureanu
Hello, Nice job there! I also published a blog post regarding `git stash`. https://ungps.github.io/ Best, Paul

Re: [PATCH 19/20] abbrev: support relative abbrev values

2018-06-13 Thread Ævar Arnfjörð Bjarmason
On Tue, Jun 12 2018, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> Change the core.abbrev config variable and the corresponding --abbrev >> command-line option to support relative values such as +1 or -1. >> >> Before Linus's e6c587c733 ("abbrev: auto size the default >>

fatal: could not reset submodule index

2018-06-13 Thread Antoine W. Campagna
Hi, I would like to add submodules to existing projects. Some branches would have the submodules and some branches would not. Since we often switch from one branch to another, I would like the submodules to update automatically so I activate the option submodule.recurse. But I am experiencing a

Re: [PATCH v2] packfile: Correct zlib buffer handling

2018-06-13 Thread Junio C Hamano
Jeremy Linton writes: >> Here is what I tentatively came up with. >> >> -- >8 -- >> From: Jeremy Linton >> Date: Wed, 13 Jun 2018 09:22:07 -0500 >> Subject: [PATCH] packfile: correct zlib buffer handling >> >> The buffer being passed to zlib includes a NUL terminator that git >> ... >> + >>

Re: [PATCH v2] packfile: Correct zlib buffer handling

2018-06-13 Thread Jeremy Linton
Hi, On Wed, Jun 13, 2018 at 1:38 PM, Junio C Hamano wrote: > Eric Sunshine writes: > >>> + buffer[size] = 0; /* assure that the buffer is still terminated */ >> >> I think we normally use '\0' for NUL on this project rather than simply 0. >> >> The comment is also effectively pure noise

[PATCH v2 6/8] fetch: refactor to make function args narrower

2018-06-13 Thread Brandon Williams
Refactor find_non_local_tags and get_ref_map to only take the information they need instead of the entire transport struct. Besides improving code clarity, this also improves their flexibility, allowing for a different set of refs to be used instead of relying on the ones stored in the transport

[PATCH v2 2/8] upload-pack: implement ref-in-want

2018-06-13 Thread Brandon Williams
Currently, while performing packfile negotiation, clients are only allowed to specify their desired objects using object ids. This causes a vulnerability to failure when an object turns non-existent during negotiation, which may happen if, for example, the desired repository is provided by

[PATCH v2 7/8] fetch-pack: put shallow info in output parameter

2018-06-13 Thread Brandon Williams
Expand the transport fetch method signature, by adding an output parameter, to allow transports to return information about the refs they have fetched. Then communicate shallow status information through this mechanism instead of by modifying the input list of refs. This does require clients to

[PATCH v2 5/8] fetch: refactor fetch_refs into two functions

2018-06-13 Thread Brandon Williams
Refactor the fetch_refs function into a function that does the fetching of refs and another function that stores them. Signed-off-by: Brandon Williams --- builtin/fetch.c | 19 +-- 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/builtin/fetch.c b/builtin/fetch.c

[PATCH v2 3/8] upload-pack: test negotiation with changing repository

2018-06-13 Thread Brandon Williams
Add tests to check the behavior of fetching from a repository which changes between rounds of negotiation (for example, when different servers in a load-balancing agreement participate in the same stateless RPC negotiation). This forms a baseline of comparison to the ref-in-want functionality

[PATCH v2 8/8] fetch-pack: implement ref-in-want

2018-06-13 Thread Brandon Williams
Implement ref-in-want on the client side so that when a server supports the "ref-in-want" feature, a client will send "want-ref" lines for each reference the client wants to fetch. Signed-off-by: Brandon Williams --- fetch-pack.c | 35 +++---

[PATCH v2 1/8] test-pkt-line: add unpack-sideband subcommand

2018-06-13 Thread Brandon Williams
Add an 'unpack-sideband' subcommand to the test-pkt-line helper to enable unpacking packet line data sent multiplexed using a sideband. Signed-off-by: Brandon Williams --- t/helper/test-pkt-line.c | 37 + 1 file changed, 37 insertions(+) diff --git

[PATCH v2 4/8] fetch: refactor the population of peer ref OIDs

2018-06-13 Thread Brandon Williams
Populate peer ref OIDs in get_ref_map instead of do_fetch. Besides tightening scopes of variables in the code, this also prepares for get_ref_map being able to be called multiple times within do_fetch. Signed-off-by: Brandon Williams --- builtin/fetch.c | 36 ++--

[PATCH v2 0/8] ref-in-want

2018-06-13 Thread Brandon Williams
Changes in v2: * issuing a want-ref line to a ref which doesn't exist is just ignored. * fixed some typos Brandon Williams (8): test-pkt-line: add unpack-sideband subcommand upload-pack: implement ref-in-want upload-pack: test negotiation with changing repository fetch: refactor the

Re: [PATCH v2] fetch-pack: don't try to fetch peel values with --all

2018-06-13 Thread Jeff King
On Tue, Jun 12, 2018 at 06:54:17PM +, Kirill Smelkov wrote: > > If an extra connection isn't a problem, you might be better off with > > "git ls-remote", and then picking through the results for refs of > > interest, and then "git fetch-pack" to actually get the pack. That's how > > git-fetch

Re: [PATCH] fetch-pack: test explicitly that --all can fetch tag references pointing to non-commits

2018-06-13 Thread Jeff King
On Wed, Jun 13, 2018 at 06:43:04PM +, Kirill Smelkov wrote: > From: Kirill Smelkov > Date: Wed, 13 Jun 2018 12:28:21 +0300 > Subject: [PATCH v2] fetch-pack: test explicitly that --all can fetch tag > references pointing to non-commits > > Fetch-pack --all became broken with respect to

Re: [PATCH 28/35] commit.c: migrate the commit buffer to the parsed object store

2018-06-13 Thread Stefan Beller
On Wed, Jun 6, 2018 at 12:32 PM Duy Nguyen wrote: > > define_commit_slab(buffer_slab, struct commit_buffer); > > struct buffer_slab is defined locally here... > ... > > +struct buffer_slab *allocate_commit_buffer_slab(void); > > So you would need a forward declaration of struct buffer_slab in >

Re: [PATCH 03/35] object: add repository argument to lookup_unknown_object

2018-06-13 Thread Stefan Beller
On Wed, Jun 6, 2018 at 12:38 PM Duy Nguyen wrote: > > On Wed, May 30, 2018 at 2:47 AM, Stefan Beller wrote: > > diff --git a/object.c b/object.c > > index 4de4fa58d59..def3c71cac2 100644 > > --- a/object.c > > +++ b/object.c > > @@ -177,7 +177,7 @@ void *object_as_type(struct object *obj, enum

Re: [PATCH] fetch-pack: test explicitly that --all can fetch tag references pointing to non-commits

2018-06-13 Thread Kirill Smelkov
On Wed, Jun 13, 2018 at 10:42:33AM -0700, Junio C Hamano wrote: > Kirill Smelkov writes: > > > Fetch-pack --all became broken with respect to unusual tags in > > 5f0fc64513 (fetch-pack: eliminate spurious error messages, 2012-09-09), > > and was fixed only recently in e9502c0a7f (fetch-pack:

Re: [RFC PATCH 0/3] submodules with no working tree shall unset core.worktree

2018-06-13 Thread Stefan Beller
On Wed, Jun 13, 2018 at 11:00 AM Junio C Hamano wrote: > > Stefan Beller writes: > > > The first patch teaches checkout/reset (with --recurse-submodules) to unset > > the core.worktree config when the new state of the superprojects working > > tree > > doesn't contain the submodules working

Re: [PATCH v2] packfile: Correct zlib buffer handling

2018-06-13 Thread Eric Sunshine
On Wed, Jun 13, 2018 at 2:32 PM Junio C Hamano wrote: > Eric Sunshine writes: > > On this project, the character mnemonic "NUL" is typically used, not > > "null" or "NULL" (which is typically reserved for pointers), so: > > s/null/NUL/g > > Correct but I did not think it is a per-project

Re: [PATCH v2] packfile: Correct zlib buffer handling

2018-06-13 Thread Junio C Hamano
Eric Sunshine writes: >> + buffer[size] = 0; /* assure that the buffer is still terminated */ > > I think we normally use '\0' for NUL on this project rather than simply 0. > > The comment is also effectively pure noise since it merely repeats > what the code already states clearly

Re: [PATCH] fetch-pack: demonstrate --all failure when remote is empty

2018-06-13 Thread Kirill Smelkov
On Wed, Jun 13, 2018 at 10:13:07AM -0700, Junio C Hamano wrote: > Kirill Smelkov writes: > > > ( Junio, please pick up the patch provided in the end ) > > > > On Tue, Jun 12, 2018 at 06:54:17PM +, Kirill Smelkov wrote: > >> On Tue, Jun 12, 2018 at 05:48:49AM -0400, Jeff King wrote: > >> > On

Re: [PATCH v2] packfile: Correct zlib buffer handling

2018-06-13 Thread Junio C Hamano
Eric Sunshine writes: > A couple comments if you happen to re-roll... > > On Wed, Jun 13, 2018 at 10:22 AM Jeremy Linton > wrote: >> The buffer being passed to zlib includes a null terminator that > > On this project, the character mnemonic "NUL" is typically used, not > "null" or "NULL"

Re: [PATCH] doc: update the order of the syntax `git merge --continue`

2018-06-13 Thread Junio C Hamano
Meng-Sung Wu writes: > The syntax "git merge HEAD " has been removed. The > order of the syntax should also be updated. > --- > Documentation/git-merge.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) An obviously good change. Could you please sign-off your patch? cf.

Re: [RFC PATCH 0/3] submodules with no working tree shall unset core.worktree

2018-06-13 Thread Junio C Hamano
Stefan Beller writes: > The first patch teaches checkout/reset (with --recurse-submodules) to unset > the core.worktree config when the new state of the superprojects working tree > doesn't contain the submodules working tree. Are there two cases of "doesn't contain working tree of a

Re: [RFC PATCH v2 2/4] git-credential-netrc: minor whitespace cleanup in test script

2018-06-13 Thread Eric Sunshine
On Wed, Jun 13, 2018 at 1:21 PM Todd Zullinger wrote: > Eric Sunshine wrote: > > Since you're touching all the tests in this script anyhow, perhaps > > modernize them [...] > > (Not necessarily worth a re-roll.) > > These tests were based on similar test_external tests which > use perl. like

Re: [PATCH] fetch-pack: test explicitly that --all can fetch tag references pointing to non-commits

2018-06-13 Thread Junio C Hamano
Kirill Smelkov writes: > Fetch-pack --all became broken with respect to unusual tags in > 5f0fc64513 (fetch-pack: eliminate spurious error messages, 2012-09-09), > and was fixed only recently in e9502c0a7f (fetch-pack: don't try to fetch > peel values with --all, 2018-06-11). However the test

Re: [PATCH] git-credential-netrc: remove use of "autodie"

2018-06-13 Thread Todd Zullinger
Hi, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> Per my reading of the file this was the only thing autodie was doing >> in this file (there was no other code it altered). So let's remove it, >> both to fix the logic error and to get rid of the dependency. >> >> 1.

Re: [RFC PATCH v2 2/4] git-credential-netrc: minor whitespace cleanup in test script

2018-06-13 Thread Todd Zullinger
Eric Sunshine wrote: > On Tue, Jun 12, 2018 at 11:10 PM, Todd Zullinger wrote: >> Signed-off-by: Todd Zullinger >> --- >> diff --git a/contrib/credential/netrc/t-git-credential-netrc.sh >> b/contrib/credential/netrc/t-git-credential-netrc.sh >> index 58191a62f8..c5661087fe 100755 >> ---

Re: [PATCH v2] packfile: Correct zlib buffer handling

2018-06-13 Thread Eric Sunshine
A couple comments if you happen to re-roll... On Wed, Jun 13, 2018 at 10:22 AM Jeremy Linton wrote: > The buffer being passed to zlib includes a null terminator that On this project, the character mnemonic "NUL" is typically used, not "null" or "NULL" (which is typically reserved for pointers),

Re: [PATCH] fetch-pack: demonstrate --all failure when remote is empty

2018-06-13 Thread Junio C Hamano
Kirill Smelkov writes: > ( Junio, please pick up the patch provided in the end ) > > On Tue, Jun 12, 2018 at 06:54:17PM +, Kirill Smelkov wrote: >> On Tue, Jun 12, 2018 at 05:48:49AM -0400, Jeff King wrote: >> > On Mon, Jun 11, 2018 at 09:43:02AM +, Kirill Smelkov wrote: > [...] > >> > >

Re: [PATCH] Use hyphenated "remote-tracking branch" (docs and comments)

2018-06-13 Thread Junio C Hamano
"Robert P. J. Day" writes: > Use the obvious consensus of hyphenated "remote-tracking branch", and > fix an obvious typo, all in documentation and comments. > > Signed-off-by: Robert P. J. Day Thanks.

Re: [PATCH] git-credential-netrc: remove use of "autodie"

2018-06-13 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > Per my reading of the file this was the only thing autodie was doing > in this file (there was no other code it altered). So let's remove it, > both to fix the logic error and to get rid of the dependency. > > 1. <87efhfvxzu@evledraar.gmail.com> >

Re: What's cooking in git.git (Jun 2018, #03; Tue, 12)

2018-06-13 Thread Stefan Beller
On Wed, Jun 13, 2018 at 8:56 AM Junio C Hamano wrote: > At this point, only clear fixes to regressions between v2.17.0..master > would be eligible for the final. Is the one you are pointing at a > breakage during that timeframe? No, it was introduced in v2.15.0..v2.16.0. Thanks, Stefan

Re: [PATCH] RelNotes 2.18: clarify where directory rename detection applies

2018-06-13 Thread Junio C Hamano
Elijah Newren writes: > Also, since the directory rename detection from this cycle was > specifically added in merge-recursive and not diffcore-rename, remove the > 'in "diff" family" phrase from the note. Thanks.

Re: What's cooking in git.git (Jun 2018, #03; Tue, 12)

2018-06-13 Thread Junio C Hamano
Stefan Beller writes: >> A tl;dr summary for -rc2 that hopefully should happen in 24 hours: >> the following four topics >> >> jk/submodule-fsck-loose-fixup >> sb/submodule-merge-in-merge-recursive >> jk/index-pack-maint >> sg/completion-zsh-workaround >> >> are planned to be merged in -rc2.

[GSoC][PATCH v2 0/2] rebase -i: rewrite the edit-todo functionality in C

2018-06-13 Thread Alban Gruin
This patch rewrites the edit-todo functionality from shell to C. This is part of the effort to rewrite interactive rebase in C. Changes since v1: - Add a new function to launch the sequence editor, as advised by Phillip Wood[0] [0]

[GSoC][PATCH v2 2/2] rebase--interactive: rewrite the edit-todo functionality in C

2018-06-13 Thread Alban Gruin
This rewrites the edit-todo functionality from shell to C. To achieve that, a new command mode, `edit-todo`, is added, and the `write-edit-todo` flag is removed, as the shell script does not need to write the edit todo help message to the todo list anymore. The shell version is then stripped in

[GSoC][PATCH v2 1/2] editor: add a function to launch the sequence editor

2018-06-13 Thread Alban Gruin
As part of the rewrite of interactive rebase, the sequencer will need to open the sequence editor to allow the user to edit the todo list. Instead of duplicating the existing launch_editor() function, this refactors it to a new function, launch_specified_editor(), which takes the editor as a

Re: GDPR compliance best practices?

2018-06-13 Thread Peter Backes
On Wed, Jun 13, 2018 at 10:12:18AM -0400, Theodore Y. Ts'o wrote: > Sure, but given that you are the one trying to claim that people need > to do all sorts of extra development work (I don't see any patches No. I am not. I said it is desirable to have a convenient solution for the problem. I did

[PATCH v2] packfile: Correct zlib buffer handling

2018-06-13 Thread Jeremy Linton
The buffer being passed to zlib includes a null terminator that git needs to keep in place. unpack_compressed_entry() attempts to detect the case that the source buffer hasn't been fully consumed by checking to see if the destination buffer has been over consumed. This causes a problem, that more

Re: GDPR compliance best practices?

2018-06-13 Thread Theodore Y. Ts'o
On Tue, Jun 12, 2018 at 09:12:19PM +0200, Peter Backes wrote: > This incorrect claim is completely inverting the logic of Art. 17. > > The logic is clarly that if ANY of lit (a) to (f) is satisfied, the > data must be deleted. > > It is not necessary for ALL of them to be satisfied. > > In

[PATCH v10] json_writer V10

2018-06-13 Thread git
From: Jeff Hostetler Here is V10 of my json-writer patch. I fixed the DEVELOPER=1 warnings that Eric pointed out and refactored the indent_pretty() code as Junio suggested. Jeff Hostetler (1): json_writer: new routines to create JSON data Makefile| 2 + json-writer.c

[PATCH v10] json_writer: new routines to create JSON data

2018-06-13 Thread git
From: Jeff Hostetler Add "struct json_writer" and a series of jw_ routines to compose JSON data into a string buffer. The resulting string may then be printed by commands wanting to support a JSON-like output format. The json_writer is limited to correctly formatting structured data for

[PATCH] fetch-pack: demonstrate --all failure when remote is empty

2018-06-13 Thread Kirill Smelkov
( Junio, please pick up the patch provided in the end ) On Tue, Jun 12, 2018 at 06:54:17PM +, Kirill Smelkov wrote: > On Tue, Jun 12, 2018 at 05:48:49AM -0400, Jeff King wrote: > > On Mon, Jun 11, 2018 at 09:43:02AM +, Kirill Smelkov wrote: [...] > > > I'm not sure, but I would say that

Re: is there a canonical doc about how to deal with whitespace issues?

2018-06-13 Thread Robert P. J. Day
On Mon, 11 Jun 2018, Stefan Beller wrote: > On Fri, Jun 8, 2018 at 10:15 AM Derrick Stolee wrote: > > > > On 6/8/2018 9:18 AM, Robert P. J. Day wrote: > > >for one of my courses, i wanted to write a section about the > > > various techniques for dealing with whitespace issues in git, so > >

[PATCH] fetch-pack: test explicitly that --all can fetch tag references pointing to non-commits

2018-06-13 Thread Kirill Smelkov
Fetch-pack --all became broken with respect to unusual tags in 5f0fc64513 (fetch-pack: eliminate spurious error messages, 2012-09-09), and was fixed only recently in e9502c0a7f (fetch-pack: don't try to fetch peel values with --all, 2018-06-11). However the test added in e9502c0a7f does not

Hello My Dear Friend,

2018-06-13 Thread Mrs.Zainab Ahmed
I have a business proposal in the tune of $10.2 Million USD for you to handle with me. I have opportunity to transfer this abandon fund to your bank account in your country which belongs to our client. I am inviting you in this transaction where this money can be shared between us at ratio

[PATCH] git-credential-netrc: remove use of "autodie"

2018-06-13 Thread Ævar Arnfjörð Bjarmason
The "autodie" module was added in Perl 5.10.1, but our INSTALL document says "version 5.8 or later is needed". As discussed in <87efhfvxzu@evledraar.gmail.com> this script is in contrib/, so we might not want to apply that policy, however in this case "autodie" was recently added as a

Re: [PATCH] checkout files in-place

2018-06-13 Thread Orgad Shaneh
On Tue, Jun 12, 2018 at 11:51 AM Edward Thomson wrote: > > On Tue, Jun 12, 2018 at 09:13:54AM +0300, Orgad Shaneh wrote: > > Some of my colleagues use an ancient version of Source Insight, which also > > locks files for write. > > If that application is locking files for writing (that is to say,

Re: [RFC PATCH v2 0/4] contrib/credential/netrc Makefile & test improvements

2018-06-13 Thread Luis Marsano
On Tue, Jun 12, 2018 at 11:10 PM Todd Zullinger wrote: > > This replaces my 2/2 "use in-tree Git.pm for tests" with > Luis's improved version. It also adds Luis's fix to ensure > the proper exit status on test failures and a minor > whitespace cleanup. > > Is it alright to forge your signoff

Re: [RFC PATCH 0/2] contrib/credential/netrc Makefile & test improvements

2018-06-13 Thread Luis Marsano
On Tue, Jun 12, 2018 at 11:08 PM Todd Zullinger wrote: > As far as removing the autodie dep, is there anything more > to that than dropping the 'use autodie' line? It looks like > doing so leaves us no worse than we were before, but I > haven't written any perl in a long time. Erasing that line