Re: RFC: Merge-related plans

Hi Stefan, On Tue, May 29, 2018 at 3:12 PM, Stefan Beller wrote: >>> (B) sounds like an independent feature, which could go in parallel? >> >> B may sound like an independent feature, but it needs a merge >> algorithm that doesn't mess with the working tree > > I agree on that, > >> so it

Re: [PATCH] completion: complete remote names too

Łukasz Stelmach writes: > "git remote update" accepts both groups and single remotes. > > Signed-off-by: Łukasz Stelmach > --- > contrib/completion/git-completion.bash | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Soliciting comments from usual suspects around this area... Thanks.

Re: [PATCH v2 5/5] fetch: implement fetch.fsck.*

Earlier I mumbled "this 4-patch series generally looks good but I need to re-read the implementation step"; I meant this 5-patch series and here is my impression after re-reading the implementation step. Ævar Arnfjörð Bjarmason writes: > diff --git a/Documentation/config.txt

Re: [PATCH v2 2/5] config doc: unify the description of fsck.* and receive.fsck.*

Junio C Hamano writes: > Between "fsck. makes sense only when you use these rare and > you-probably-never-heard-of tools ongoing basis" and "when you > already have (slightly)broken objects, naming each of them in > skiplist, rather than covering the class, is better because you want > *new*

Re: [RFC PATCH 00/35] object-store: lookup_commit

On Tue, May 29, 2018 at 6:05 PM, Derrick Stolee wrote: > On 5/29/2018 8:47 PM, Stefan Beller wrote: >> >> This applies on the merge of nd/commit-util-to-slab and >> sb/object-store-grafts, >> and is available at http://github.com/stefanbeller/ as branch >> object-store-lookup-commit >> as the

Re: [PATCH v2 2/5] config doc: unify the description of fsck.* and receive.fsck.*

Ævar Arnfjörð Bjarmason writes: > On Mon, May 28, 2018 at 11:45 AM, Junio C Hamano wrote: >> If the project has some tool constraints and have to accept new >> "broken" objects on ongoing basis, then fsck. facility may >> make sense, but that is probably a very narrow special use case. > > That

Re: [PATCH] fsckObjects tests: show how v2.17.1 can exploit downstream

Ævar Arnfjörð Bjarmason writes: > The receive.fsckObjects variable only kicks in when someone pushes to > you, not when you fetch something malicious and someone then fetches > from you. > ... Yes, that is what was described in the release notes as the server side support. If you want to avoid

Re: [PATCH] branch: issue "-l" deprecation warning after pager starts

Jeff King writes: > Right, what I meant by "gentler" is that we continue to perform the same > behavior as the old version, alongside the warning. It's arguable here > because running "git branch -l" has _always_ been wrong. It's just wrong > in a way that happens to do what the user wants. ;) >

Re: [PATCH] branch: issue "-l" deprecation warning after pager starts

Jeff King writes: >> -if (list) { >> -warning("the '-l' option is an alias for >> '--create-reflog' and"); >> -warning("has no effect in list mode. This option will >> soon be"); >> -warning("removed and you should omit it

Re: Is origin/HEAD only being created on clone a bug? #leftoverbits

Junio C Hamano writes: > - When we fetch from a remote that has refs/remotes/$name/HEAD, and >if the protocol notices that their HEAD today is pointing to a >branch different from what our side has, should we repoint ours >to match? > >I am leaning against doing this, but

Re: [RFC PATCH 1/3] usage: extract `prefix_suffix_lines()` from `advise()`

Jeff King writes: > But most importantly, it means we could eventually colorize errors, too, > where we are not allowed to allocate. > > So perhaps: > > void report_lines(FILE *out, > const char *color, const char *color_reset, > const char *prefix, const

Re: [PATCH] fsckObjects tests: show how v2.17.1 can exploit downstream

Jeff King writes: >> It's worth testing for this explicitly. So let's amend the tests added >> in 73c3f0f704 ("index-pack: check .gitmodules files with --strict", >> 2018-05-04) to show how this can result in a v2.17.1 client passing >> along the evil objects. > > I'm not sure what testing this

Re: Is origin/HEAD only being created on clone a bug? #leftoverbits

Ævar Arnfjörð Bjarmason writes: > If you make an initial commit and push to a remote repo "origin", you > don't get a remote origin/HEAD reference, and a "fetch" won't create it > either. > ... > Some code spelunking reveals remote_head_points_at, guess_remote_head() > etc. in builtin/clone.c.

Re: [RFC PATCH 00/35] object-store: lookup_commit

On 5/29/2018 8:47 PM, Stefan Beller wrote: This applies on the merge of nd/commit-util-to-slab and sb/object-store-grafts, and is available at http://github.com/stefanbeller/ as branch object-store-lookup-commit as the merge has some merge conflicts as well as syntactical conflicts

Re: [PATCH] commit-graph: fix a sparse 'integer as NULL pointer' warning

n 5/29/2018 4:01 PM, Ramsay Jones wrote: Signed-off-by: Ramsay Jones --- Hi Derrick, If you need to re-roll your 'ds/commit-graph-fsck' branch (pu@a84e06bc0f), could you please squash this into the relevant patch (commit 80453b4529, "commit-graph: add 'verify' subcommand", 2018-05-24). [No,

[PATCH 13/35] commit: add repository argument to get_cached_commit_buffer

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 18/35] commit: add repository argument to parse_commit

Add a repository argument to allow callers of parse_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 callers

[PATCH 19/35] object: allow object_as_type to handle arbitrary repositories

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 eb35e82a4a9..fabd3ea2134 100644 --- a/object.c +++ b/object.c @@ -158,13 +158,13 @@ void *create_object(struct repository *r, const

[PATCH 16/35] tag: add repository argument to deref_tag

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 15/35] tag: add repository argument to parse_tag_buffer

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 17/35] object: add repository argument to parse_commit_gently

Add a repository argument to allow callers of parse_commit_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 macro to catch

[PATCH 14/35] tag: add repository argument to lookup_tag

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 28/35] commit.c: migrate the commit buffer to the parsed object store

Signed-off-by: Stefan Beller --- commit.c | 29 +++-- commit.h | 2 ++ object.c | 5 + object.h | 2 ++ 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/commit.c b/commit.c index fd31c453fdc..45dbf6f1453 100644 --- a/commit.c +++ b/commit.c @@

[PATCH 27/35] commit-slabs: remove realloc counter outside of slab struct

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 31/35] object.c: allow parse_object_buffer to handle arbitrary repositories

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 ce29601c6c2..d3bdee6888f 100644 --- a/object.c +++ b/object.c @@ -185,21 +185,21 @@ struct object

[PATCH 29/35] commit.c: allow set_commit_buffer to handle arbitrary repositories

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 45dbf6f1453..b824e69186e 100644 --- a/commit.c +++ b/commit.c @@ -262,10 +262,10 @@ void free_commit_buffer_slab(struct buffer_slab *bs)

[PATCH 32/35] object.c: allow parse_object to handle arbitrary repositories

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 d3bdee6888f..c2246e21ee4 100644 --- a/object.c +++ b/object.c @@ -245,28 +245,28 @@ struct object *parse_object_or_die(const

[PATCH 33/35] tag.c: allow deref_tag to handle arbitrary repositories

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 30/35] commit.c: allow get_cached_commit_buffer to handle arbitrary repositories

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 b824e69186e..383997817f0 100644 --- a/commit.c +++ b/commit.c @@ -270,10 +270,10 @@ void set_commit_buffer(struct repository *r, struct

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

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 f1bea3d1612..b54aed12170 100644 --- a/commit.c +++ b/commit.c @@ -35,9 +35,9 @@ struct commit *lookup_commit_reference_gently(struct

[PATCH 21/35] blob: allow lookup_blob to handle arbitrary repositories

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 34/35] commit.c: allow lookup_commit_reference_gently to handle arbitrary repositories

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 383997817f0..f1bea3d1612 100644 --- a/commit.c +++ b/commit.c @@ -23,16 +23,16 @@ int save_commit_buffer = 1; const char

[PATCH 20/35] object: allow lookup_object to handle arbitrary repositories

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 fabd3ea2134..03180f84b2a 100644 --- a/object.c +++ b/object.c @@ -84,21 +84,20 @@ static

[PATCH 22/35] tree: allow lookup_tree to handle arbitrary repositories

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 6b83942e444..58baf29c96f 100644 --- a/tree.c +++ b/tree.c @@ -195,13 +195,13 @@ int read_tree(struct tree *tree, int stage, struct

[PATCH 26/35] commit.c: allow parse_commit_buffer to handle arbitrary repositories

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 492bccf10eb..fd31c453fdc 100644 --- a/commit.c +++ b/commit.c @@ -335,7 +335,7 @@ const void *detach_commit_buffer(struct commit

[PATCH 24/35] tag: allow lookup_tag to handle arbitrary repositories

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 23/35] commit: allow lookup_commit to handle arbitrary repositories

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 8e7dfafe850..492bccf10eb 100644 --- a/commit.c +++ b/commit.c @@ -52,13 +52,13 @@ struct commit *lookup_commit_or_die(const

[PATCH 25/35] tag: allow parse_tag_buffer to handle arbitrary repositories

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 02/35] object: add repository argument to lookup_object

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 06/35] blob: add repository argument to lookup_blob

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 04/35] object: add repository argument to parse_object_buffer

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 12/35] commit: add repository argument to set_commit_buffer

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 10/35] commit: add repository argument to lookup_commit

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 11/35] commit: add repository argument to parse_commit_buffer

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 01/35] object: add repository argument to parse_object

Add a repository argument to allow the callers of parse_object 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 09/35] commit: add repository argument to lookup_commit_reference

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 07/35] tree: add repository argument to lookup_tree

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

[PATCH 08/35] commit: add repository argument to lookup_commit_reference_gently

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

[RFC PATCH 00/35] object-store: lookup_commit

This applies on the merge of nd/commit-util-to-slab and sb/object-store-grafts, and is available at http://github.com/stefanbeller/ as branch object-store-lookup-commit as the merge has some merge conflicts as well as syntactical conflicts (upload-pack.c and fetch-pack.c introduce new calls of

[PATCH 05/35] object: add repository argument to object_as_type

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 03/35] object: add repository argument to lookup_unknown_object

From: Jonathan Nieder Add a repository argument to allow callers of lookup_unknown_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

Re: RFC: Merge-related plans

context: https://public-inbox.org/git/cabpp-bfqjzhfcjz1qvhvvcmd-_sofi0fkm5pexewzzn+zw2...@mail.gmail.com/ Hi Elijah, >> Most items forward-reference "Depends on () up to here; >> (H) seems independent, but might be a good first start. >> (G) [8] is queued as origin/en/merge-recursive-tests, or

Re: [PATCH] fsckObjects tests: show how v2.17.1 can exploit downstream

On Tue, May 29 2018, Jeff King wrote: > On Tue, May 29, 2018 at 09:19:50PM +, Ævar Arnfjörð Bjarmason wrote: > >> Something that's known but not explicitly discussed in the v2.17.1 >> release notes, or tested for, is that v2.17.1 will still happily pass >> on evil .gitmodules objects by

Re: [RFC PATCH 1/3] usage: extract `prefix_suffix_lines()` from `advise()`

On Fri, May 25, 2018 at 11:00:53PM +0200, Martin Ågren wrote: > +/* > + * Write the message to the file, prefixing and suffixing > + * each line with `prefix` resp. `suffix`. > + */ > +void prefix_suffix_lines(FILE *f, const char *prefix, > + const char *message, const char

Re: [RFC PATCH 1/3] usage: extract `prefix_suffix_lines()` from `advise()`

On Mon, May 28, 2018 at 08:40:16PM +0200, Duy Nguyen wrote: > On Fri, May 25, 2018 at 11:00 PM, Martin Ågren wrote: > > advice.c contains a useful code snippet which takes a multi-line string > > and prints the lines, prefixing and suffixing each line with two > > constant strings. This was

Re: [RFC PATCH 2/3] usage: prefix all lines in `vreportf()`, not just the first

On Mon, May 28, 2018 at 06:25:18PM +0900, Junio C Hamano wrote: > Martin Ågren writes: > > > diff --git a/t/t1011-read-tree-sparse-checkout.sh > > b/t/t1011-read-tree-sparse-checkout.sh > > index 0c6f48f302..31b0702e6c 100755 > > --- a/t/t1011-read-tree-sparse-checkout.sh > > +++

Re: [PATCH] fsckObjects tests: show how v2.17.1 can exploit downstream

On Tue, May 29, 2018 at 09:19:50PM +, Ævar Arnfjörð Bjarmason wrote: > Something that's known but not explicitly discussed in the v2.17.1 > release notes, or tested for, is that v2.17.1 will still happily pass > on evil .gitmodules objects by default to vulnerable downstream > clients. > >

Re: [PATCH] branch: issue "-l" deprecation warning after pager starts

On Tue, May 29, 2018 at 05:20:29PM -0400, Jeff King wrote: > Thanks. There's one bit missing here, because it did not cause a textual > conflict during the rebase (but it's now dead code). Patch below (to be > squashed to the tip of jk/branch-l-1-removal). > [...] > - if

Re: [PATCH] branch: issue "-l" deprecation warning after pager starts

On Sat, May 26, 2018 at 11:32:35AM +0900, Junio C Hamano wrote: > Junio C Hamano writes: > > > Yup, thanks for being extra explicit. I do imagine there are quite > > a few of us who would be puzzled without this update (but with the > > previous one to unhide it from behind the pager). > >

[PATCH] fsckObjects tests: show how v2.17.1 can exploit downstream

Something that's known but not explicitly discussed in the v2.17.1 release notes, or tested for, is that v2.17.1 will still happily pass on evil .gitmodules objects by default to vulnerable downstream clients. This could happen e.g. if an in-house git hosting site is mirroring a remote repository

Re: [PATCH] branch: issue "-l" deprecation warning after pager starts

On Sun, May 27, 2018 at 12:15:40AM +0530, Kaartic Sivaraam wrote: > > Hmm, actually, I suppose the true value of the warning is to help people > > doing "git branch -l foo", and it would still work there. The "more > > extreme" from your suggested patch would only affect "branch -l". > > > >

Re: Weird revision walk behaviour

On Tue, May 29, 2018 at 12:06:51AM +0200, SZEDER Gábor wrote: > diff --git a/revision.c b/revision.c > index 4e0e193e57..0ddd2c1e8a 100644 > --- a/revision.c > +++ b/revision.c > @@ -605,7 +605,7 @@ static inline int limiting_can_increase_treesame(const > struct rev_info *revs) > > static

Re: RFC: Merge-related plans

Hi Stefan, On Tue, May 29, 2018 at 11:19 AM, Stefan Beller wrote: > On Mon, May 28, 2018 at 1:48 PM, Elijah Newren wrote: >> Currently, I would like to: >> >> A) Fix cases where directory rename detection does not work with >>rebase/am due to how they call merge-recursive. >> >>Notes:

[ANNOUNCE] Git for Windows 2.17.1(2)

Dear Git users, It is my pleasure to announce that Git for Windows 2.17.1(2) is available from: https://gitforwindows.org/ Changes since Git for Windows v2.17.0 (April 3rd 2018) New Features * Comes with Git v2.17.1. * Comes with Perl v5.26.2. * The installer now offers VS Code

[PATCH] commit-graph: fix a sparse 'integer as NULL pointer' warning

Signed-off-by: Ramsay Jones --- Hi Derrick, If you need to re-roll your 'ds/commit-graph-fsck' branch (pu@a84e06bc0f), could you please squash this into the relevant patch (commit 80453b4529, "commit-graph: add 'verify' subcommand", 2018-05-24). [No, No, that was the one in graph_read(). :-D

Re: [PATCH 2/1] SubmittingPatches: not git-secur...@googlegroups.com

On Tue, May 29, 2018 at 07:02:03PM +0100, Thomas Gummerer wrote: > On 05/28, Junio C Hamano wrote: > > This is a tangent, but the use of footnote below looks a but > > curious. How would {1} reference pick which :1: to use? The > > closest preceding one? > > Tbh I didn't look at the docs for

Re: Is origin/HEAD only being created on clone a bug? #leftoverbits

On 05/29, Ævar Arnfjörð Bjarmason wrote: > Here's some more #leftoverbits where we have a clone/fetch feature > discrepancy and where clone is magical in ways that "fetch" isn't. > > If you make an initial commit and push to a remote repo "origin", you > don't get a remote origin/HEAD reference,

Re: [PATCH v2 3/3] completion: collapse extra --no-.. options

On Tue, May 29, 2018 at 8:48 PM, Stefan Beller wrote: > On Sun, May 27, 2018 at 1:38 AM, Nguyễn Thái Ngọc Duy > wrote: >> The commands that make use of --git-completion-helper feature could >> now produce a lot of --no-xxx options that a command can take. This in >> many case could nearly

Re: [PATCH v2 3/3] completion: collapse extra --no-.. options

On Sun, May 27, 2018 at 1:38 AM, Nguyễn Thái Ngọc Duy wrote: > The commands that make use of --git-completion-helper feature could > now produce a lot of --no-xxx options that a command can take. This in > many case could nearly double the amount of completable options, using > more screen estate

format-patch: no 'prerequisite-patch-id' info when specifying commit range

Hi, I'm trying to use git-format-patch --base to generate the list of prerequisite patches for a series, but the behavior of git doesn't seem to match the documentation: When using a commit count (e.g.: "-2"), git-format-patch generates the prerequisite-patch-id lines as expected. But when

Is origin/HEAD only being created on clone a bug? #leftoverbits

Here's some more #leftoverbits where we have a clone/fetch feature discrepancy and where clone is magical in ways that "fetch" isn't. If you make an initial commit and push to a remote repo "origin", you don't get a remote origin/HEAD reference, and a "fetch" won't create it either. You will get

Re: RFC: Merge-related plans

On Mon, May 28, 2018 at 1:48 PM, Elijah Newren wrote: > Hi everyone, > > I have some merge-related plans (and work in progress) that I'd like > to get some feedback on in order to find what order would be best to > address things in, if there are special steps I should take while > approaching

Re: [PATCH 2/1] SubmittingPatches: not git-secur...@googlegroups.com

On 05/29, Thomas Gummerer wrote: > On 05/28, Junio C Hamano wrote: > > Thomas Gummerer writes: > > > > > Yeah sorry, that's what I meant. > > > https://public-inbox.org/git/20180308150820.22588-1-ava...@gmail.com/ > > > is the reference I meant to put there. > > > > > > How about something like

Re: [PATCH 2/1] SubmittingPatches: not git-secur...@googlegroups.com

On 05/28, Junio C Hamano wrote: > Thomas Gummerer writes: > > > Yeah sorry, that's what I meant. > > https://public-inbox.org/git/20180308150820.22588-1-ava...@gmail.com/ > > is the reference I meant to put there. > > > > How about something like the below? This is tested with asciidoc > >

Re: [PATCH v2 01/11] Add and use generic name->id mapping code for color slot parsing

On Sat, May 26, 2018 at 6:55 AM, Nguyễn Thái Ngọc Duy wrote: > Instead of hard coding the name-to-id mapping in C code, keep it in an > array and use a common function to do the parsing. This reduces code > and also allows us to list all possible color slots later. > > This starts using C99

Re: [RFC PATCH] fetch-pack: space out sent "haves" in negotiation

On Wed, 23 May 2018 12:42:10 +0900 Junio C Hamano wrote: > Somehow this feels more like a WIP than RFC, primarily for two > reasons. It was unclear what "edge" computation is trying to do; it > seems way under-explained, especially the part that takes min-max > while. merging two candidates.

Re: RFC: New reference iteration paradigm

On Sat, May 26, 2018 at 07:25:32PM +0200, Jakub Narebski wrote: > > At one point I wrote a patch to binary search the packed-refs file, find > > the first "refs/tags/" entry, and then walk linearly through there. What > > stopped me is that the current refs.c code (I guess file-backend.c these >

Re: js/empty-config-section-fix, was Re: What's cooking in git.git (May 2018, #03; Wed, 23)

On Mon, May 28, 2018 at 01:20:41PM +0200, Johannes Schindelin wrote: > On Mon, 28 May 2018, Junio C Hamano wrote: > > > Johannes Schindelin writes: > > > > > On Thu, 24 May 2018, Junio C Hamano wrote: > > > > > >> * js/empty-config-section-fix (2018-05-18) 1 commit > > >> - config: a

[PATCH] sequencer: ensure labels that are object IDs are rewritten

When writing the todo script for --rebase-merges, we try to find a label for certain commits. If the label ends up being a valid object ID, such as when we merge a detached commit, we want to rewrite it so it is no longer a valid object ID. However, the code path that does this checks for its

Re: [RFC PATCH 2/3] usage: prefix all lines in `vreportf()`, not just the first

On Tue, May 29, 2018 at 6:49 AM, Martin Ågren wrote: > On 28 May 2018 at 23:45, Junio C Hamano wrote: >> Duy Nguyen writes: >> > +error: sub/added > +error: sub/addedtoo > +error: Please move or remove them before you switch branches. > Aborting > EOF

Re: [PATCH v3 00/20] Integrate commit-graph into 'fsck' and 'gc'

Derrick Stolee writes: > On 5/29/2018 12:27 AM, Junio C Hamano wrote: >> Derrick Stolee writes: >> >>> Thanks for all the feedback on v2. I've tried to make this round's >>> review a bit easier by splitting up the commits into smaller pieces. >>> Also, the test script now has less boilerplate

Re: [PATCH v3 07/20] commit-graph: verify catches corrupt signature

On 5/28/2018 10:05 AM, Jakub Narebski wrote: Derrick Stolee writes: This is the first of several commits that add a test to check that 'git commit-graph verify' catches corruption in the commit-graph file. The first test checks that the command catches an error in the file signature. This is

Re: [PATCH v3 00/20] Integrate commit-graph into 'fsck' and 'gc'

On 5/29/2018 12:27 AM, Junio C Hamano wrote: Derrick Stolee writes: Thanks for all the feedback on v2. I've tried to make this round's review a bit easier by splitting up the commits into smaller pieces. Also, the test script now has less boilerplate and uses variables and clear arithmetic to

Re: [PATCH v3 03/20] commit-graph: parse commit from chosen graph

On 5/27/2018 6:23 AM, Jakub Narebski wrote: Derrick Stolee writes: Before verifying a commit-graph file against the object database, we need to parse all commits from the given commit-graph file. Create parse_commit_in_graph_one() to target a given struct commit_graph. If I understand it

[PATCH] Fix grammar in "templates not found" msg

Signed-off-by: Robert P. J. Day --- diff --git a/builtin/init-db.c b/builtin/init-db.c index 2542c5244..ec898f2c6 100644 --- a/builtin/init-db.c +++ b/builtin/init-db.c @@ -117,7 +117,7 @@ static void copy_templates(const char *template_dir) dir = opendir(template_path.buf);

Re: [RFC PATCH 2/3] usage: prefix all lines in `vreportf()`, not just the first

Martin Ågren writes: > About the _("\t")-approach that you mentioned up-thread. It would allow > a translator to adjust all the indentations for a particular language. > To be clear, what you mean is _(" " /* 9 spaces */) to align > nicely with "warning: ", which is the longest English

Re: [PATCH] t990X: use '.git/objects' as 'deep inside .git' path

On 5/27/2018 12:49 AM, Michael Haggerty wrote: On Sat, May 26, 2018 at 8:47 AM, Christian Couder wrote: Tests t9902-completion.sh and t9903-bash-prompt.sh each have tests that check what happens when we are "in the '.git' directory" and when we are "deep inside the '.git' directory". To test

Re: [RFC PATCH 2/3] usage: prefix all lines in `vreportf()`, not just the first

On 29 May 2018 at 07:50, Junio C Hamano wrote: > Martin Ågren writes: > >>> - allow callers to align 1st prefix (e.g. "error: ") with the >>>leading indent for the second and subsequent lines by passing the >>>second prefix with appropriate display width. >> >> I suspect this second

Re: Weird revision walk behaviour

On 29/05/2018 01:06, SZEDER Gábor wrote: So, without investing nearly enough time to understand what is going on, I massaged the above diffs into this: Cool. + treesame_parents = xmalloc(sizeof(*treesame_parents)); There's no need to actually record a list