Re: [PATCH v4 2/3] reset: add new reset.quiet config setting

2018-10-25 Thread Ramsay Jones
> report and leave further refinements to incremental updates as > needed? Yeah, the first version gave me a 'huh?' moment (hence the comment), the last version was better and, as you can see, I am no great shakes at wordsmith-ing documentation! ;-) Thanks! ATB, Ramsay Jones

Re: [PATCH] i18n: make GETTEXT_POISON a runtime option

2018-10-24 Thread Ramsay Jones
through the exact sequence in your paragraph when writing > my other message. That's probably a good sign that we should probably > not pursue this further unless we see the use case come up again a few > more times (and if we do, then consider "config" the least-bad place to > do it). I was thinking: $ git var -e GIT_WHATEVER_ENV [-e for environment]. ... but that is really no different than git-config. ;-) ATB, Ramsay Jones

Re: [PATCH v4 2/3] reset: add new reset.quiet config setting

2018-10-23 Thread Ramsay Jones
ions can be used to override any configured default. Hmm, I am not sure that is any better! :-D Also, note that the --no-option is often described separately to the --option (in a separate paragraph). I don't know if that would help here. [The default behaviour is _not_ set by the con

Re: [PATCH v3 2/3] reset: add new reset.quiet config setting

2018-10-22 Thread Ramsay Jones
rs. The default behavior respects the > + `reset.quiet` config option, or `--no-quiet` if that is not set. Sorry, I can't quite parse this; -q,--quiet and --no-quiet on the command line (should) trump whatever rest.quiet is set to in the configuration. Is that not the case? ATB, Ramsa

Re: [PATCH] config.mak.dev: enable -Wunused-function

2018-10-18 Thread Ramsay Jones
deeply, but this seems to be caused by Junio's commit 42c89ea70a ("SQUASH??? - convert the other user of string-list as db", 2018-10-17) which removes a call to the add_existing() function - the subject of the warning. [BTW there is another 'static add_existing()' in builtin/show_ref.c] ATB, Ramsay Jones

[PATCH v2] headers: normalize the spelling of some header guards

2018-10-17 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Junio, Since I didn't get any adverse comments, this version has the RFC label removed. Also, given that it seems the vcs-svn directory is not going away soon, I have included those headers this time as well. [Note: my email client (thunderbird) was up

Re: [PATCH v2 1/1] zlib.c: use size_t for size

2018-10-14 Thread Ramsay Jones
On 15/10/18 01:01, Jeff King wrote: > On Sun, Oct 14, 2018 at 04:03:48PM +0100, Ramsay Jones wrote: > >>> So I kind of wonder if a comment would be better than xsize_t here. >>> Something like: >>> >>> if (avail > len) { >>> /* >&

Re: [RFC/PATCH] headers: normalize the spelling of some header guards

2018-10-14 Thread Ramsay Jones
On 15/10/18 00:59, Jeff King wrote: > On Sun, Oct 14, 2018 at 09:13:09PM +0100, Ramsay Jones wrote: > >> This patch is marked RFC because I am not aware of any policy with >> regard to header guard spelling. Having said that, apart from the >> fetch-negotiator.h head

[RFC/PATCH] headers: normalize the spelling of some header guards

2018-10-14 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Junio, This patch is marked RFC because I am not aware of any policy with regard to header guard spelling. Having said that, apart from the fetch-negotiator.h header, all of these headers are using a reserved identifier (see C99 Standard 7.1.3). These

Re: [PATCH v2 1/1] zlib.c: use size_t for size

2018-10-14 Thread Ramsay Jones
On 14/10/18 03:52, Jeff King wrote: > On Sun, Oct 14, 2018 at 03:16:36AM +0100, Ramsay Jones wrote: > >> diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c >> index b059b86aee..3b5f2c38b3 100644 >> --- a/builtin/pack-objects.c >> +++ b/builtin/pack-o

Re: [PATCH v2 1/1] zlib.c: use size_t for size

2018-10-13 Thread Ramsay Jones
On 14/10/18 03:16, Ramsay Jones wrote: > > > On 13/10/18 06:00, Torsten Bögershausen wrote: >> [] >>> Neither v1 nor v2 of this patch compiles on 32 bit Linux; see >>> >>> https://travis-ci.org/git/git/jobs/440514375#L628 >>> >>> T

Re: [PATCH v2 1/1] zlib.c: use size_t for size

2018-10-13 Thread Ramsay Jones
built this on MINGW32 and MINGW64 along with some light manual testing (the test suite has never passed on Msys2 for me). This is not the same as testing on Gfw, of course. ATB, Ramsay Jones -- >8 -- From: Martin Koegler Subject: [PATCH v3 1/1] zlib.c: use size_t for size Signed-off-by: Mar

Re: [PATCH] zlib.c: use size_t for size

2018-10-12 Thread Ramsay Jones
The primary reason was that >> nobody tried to dust it off and reignite the topic so far---which I >> am trying to correct, but as I said, this is just minimally adjusted >> to today's codebase, without any attempt to improve relative to the >> original patch. &g

Re: [PATCH v4 4/4] transport.c: introduce core.alternateRefsPrefixes

2018-10-02 Thread Ramsay Jones
t; && > + git rev-parse private/branch expect && s/expect/>expect/ ? ATB, Ramsay Jones > + printf "" | git receive-pack fork >actual && > + extract_haves actual.haves && > + test_cmp expect actual.haves > +' &g

Re: [PATCH v6 4/7] config: add new index.threads config setting

2018-09-28 Thread Ramsay Jones
= istate->cache_nr / THREAD_COST; > -       if (ieot_blocks < 1) > -   ieot_blocks = 1; >     cpus = online_cpus(); >     if (ieot_blocks > cpus - 1) >     ieo

Re: [PATCH] read-cache: fix division by zero core-dump

2018-09-28 Thread Ramsay Jones
On 28/09/18 02:20, Ben Peart wrote: > > > On 9/27/2018 6:24 PM, Ramsay Jones wrote: >> >> commit 225df8a468 ("ieot: add Index Entry Offset Table (IEOT) >> extension", 2018-09-26) added a 'DIV_ROUND_UP(entries, ieot_blocks) >> expression, wh

[PATCH] read-cache: fix division by zero core-dump

2018-09-27 Thread Ramsay Jones
ite, until test t4056-diff-order.sh, which then went into an infinite loop! Signed-off-by: Ramsay Jones --- Hi Ben, Could you please squash this into the relevant commits on your 'bp/read-cache-parallel' branch. (The first hunk fixes a sparse warning about using an integer as a NUL

[PATCH] fetch: fix compilation warning

2018-09-27 Thread Ramsay Jones
commit 440fc7c0729 ("fetch: replace string-list used as a look-up table with a hashmap", 2018-09-25) renamed a string-list variable (while adding a hashmap of the same name) and forgot to rename the string-list variable in a call to string_list_clear(). Signed-off-by: Ramsay Jone

Re: [PATCH] fetch-object.h: add missing declaration (hdr-check)

2018-09-21 Thread Ramsay Jones
On 21/09/18 17:21, Junio C Hamano wrote: > Ramsay Jones writes: > >> Signed-off-by: Ramsay Jones >> --- >> >> Hi Junio, >> >> This is the patch I needed for the current 'next' branch to get >> a clean 'hdr-check' > >

Re: [PATCH 1/9] Makefile: add a hdr-check target

2018-09-20 Thread Ramsay Jones
On 20/09/18 15:26, Junio C Hamano wrote: > Ramsay Jones writes: > >> Commit ef3ca95475 ("Add missing includes and forward declarations", >> 2018-08-15) resulted from the author employing a manual method to >> create a C file consisting of a pair of pre-pro

Re: [PATCH 9/9] commit-reach.h: add missing declarations (hdr-check)

2018-09-20 Thread Ramsay Jones
On 20/09/18 00:38, Derrick Stolee wrote: > On 9/18/2018 8:15 PM, Ramsay Jones wrote: >> Signed-off-by: Ramsay Jones >> --- >>   commit-reach.h | 5 +++-- >>   1 file changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/commit-reach.h b/commit-

Re: [PATCH 1/9] Makefile: add a hdr-check target

2018-09-19 Thread Ramsay Jones
On 19/09/18 18:49, Martin Ågren wrote: > Hi Ramsay, > > On Wed, 19 Sep 2018 at 02:07, Ramsay Jones > wrote: >> @@ -2675,6 +2676,17 @@ $(SP_OBJ): %.sp: %.c GIT-CFLAGS FORCE >> .PHONY: sparse $(SP_OBJ) >> sparse: $(SP_OBJ) >> >> +GEN_HDRS := comma

[PATCH] userdiff.h: add missing declaration (hdr-check)

2018-09-18 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Junio, ... and this is the patch I needed for the current 'pu' branch. ATB, Ramsay Jones userdiff.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/userdiff.h b/userdiff.h index dad3fc03c1..b072bfe89a 100644 --- a/userdiff.h +++ b/userdiff

[PATCH] fetch-object.h: add missing declaration (hdr-check)

2018-09-18 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Junio, This is the patch I needed for the current 'next' branch to get a clean 'hdr-check' ATB, Ramsay Jones fetch-object.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fetch-object.h b/fetch-object.h index d2f996d4e8..d64

[PATCH 9/9] commit-reach.h: add missing declarations (hdr-check)

2018-09-18 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- commit-reach.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/commit-reach.h b/commit-reach.h index 7d313e2975..f41d8f6ba3 100644 --- a/commit-reach.h +++ b/commit-reach.h @@ -1,12 +1,13 @@ #ifndef __COMMIT_REACH_H__ #define

[PATCH 8/9] delta-islands.h: add missing forward declarations (hdr-check)

2018-09-18 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- delta-islands.h | 4 1 file changed, 4 insertions(+) diff --git a/delta-islands.h b/delta-islands.h index f9725730f4..b635cd07d8 100644 --- a/delta-islands.h +++ b/delta-islands.h @@ -1,6 +1,10 @@ #ifndef DELTA_ISLANDS_H #define DELTA_ISLANDS_H +struct

[PATCH 7/9] midx.h: add missing forward declarations (hdr-check)

2018-09-18 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- midx.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/midx.h b/midx.h index a210f1af2a..622ddac472 100644 --- a/midx.h +++ b/midx.h @@ -3,6 +3,9 @@ #include "repository.h" +struct object_id; +struct pack_entry; + struct multi_

[PATCH 6/9] refs/refs-internal.h: add missing declarations (hdr-check)

2018-09-18 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- refs/refs-internal.h | 4 1 file changed, 4 insertions(+) diff --git a/refs/refs-internal.h b/refs/refs-internal.h index 04425d6d1e..44d53672c7 100644 --- a/refs/refs-internal.h +++ b/refs/refs-internal.h @@ -1,8 +1,12 @@ #ifndef REFS_REFS_INTERNAL_H

[PATCH 5/9] refs/packed-backend.h: add missing declaration (hdr-check)

2018-09-18 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- refs/packed-backend.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/refs/packed-backend.h b/refs/packed-backend.h index 640245d3b9..a01a0aff9c 100644 --- a/refs/packed-backend.h +++ b/refs/packed-backend.h @@ -1,6 +1,8 @@ #ifndef REFS_PACKED_BACKEND_H

[PATCH 4/9] refs/ref-cache.h: add missing declarations (hdr-check)

2018-09-18 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- refs/ref-cache.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/refs/ref-cache.h b/refs/ref-cache.h index eda65e73ed..3bfb89d2b3 100644 --- a/refs/ref-cache.h +++ b/refs/ref-cache.h @@ -1,7 +1,10 @@ #ifndef REFS_REF_CACHE_H #define REFS_REF_CACHE_H

[PATCH 3/9] ewah/ewok_rlw.h: add missing include (hdr-check)

2018-09-18 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- ewah/ewok_rlw.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ewah/ewok_rlw.h b/ewah/ewok_rlw.h index 7cdfdd0c02..d487966935 100644 --- a/ewah/ewok_rlw.h +++ b/ewah/ewok_rlw.h @@ -19,6 +19,8 @@ #ifndef __EWOK_RLW_H__ #define __EWOK_RLW_H__ +#include

[PATCH 2/9] json-writer.h: add missing include (hdr-check)

2018-09-18 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- json-writer.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/json-writer.h b/json-writer.h index fc18acc7d9..83906b09c1 100644 --- a/json-writer.h +++ b/json-writer.h @@ -42,6 +42,8 @@ * of the given strings. */ +#include "strbuf.h"

[PATCH 1/9] Makefile: add a hdr-check target

2018-09-18 Thread Ramsay Jones
that individual header files can be checked directly using the '.hco' extension (read: Hdr-Check Object) like so: $ make config.hco HDR config.h $ Signed-off-by: Ramsay Jones --- Makefile | 12 1 file changed, 12 insertions(+) diff --git a/Makefile b/Makef

Subject: [PATCH 0/9] hdr-check

2018-09-18 Thread Ramsay Jones
ranch. [1] https://public-inbox.org/git/b8553a50-6b97-2b45-2f7b-cfe257654...@ramsayjones.plus.com/ ATB, Ramsay Jones Ramsay Jones (9): Makefile: add a hdr-check target json-writer.h: add missing include (hdr-check) ewah/ewok_rlw.h: add missing include (hdr-check) refs/ref-cache.h: add

Re: [PATCH] read-cache.c: fix a sparse warning

2018-09-17 Thread Ramsay Jones
On 17/09/18 17:27, Ramsay Jones wrote: > > > On 17/09/18 15:15, Ben Peart wrote: >> >> >> On 9/16/2018 3:17 AM, Eric Sunshine wrote: >>> On Fri, Sep 14, 2018 at 7:29 PM Ramsay Jones >>> wrote: >>>> At one time, the POSIX standard

Re: [PATCH] read-cache.c: fix a sparse warning

2018-09-17 Thread Ramsay Jones
On 17/09/18 15:15, Ben Peart wrote: > > > On 9/16/2018 3:17 AM, Eric Sunshine wrote: >> On Fri, Sep 14, 2018 at 7:29 PM Ramsay Jones >> wrote: >>> At one time, the POSIX standard required the type used to represent >>> a thread handle (pthread_t) b

[PATCH] read-cache.c: fix a sparse warning

2018-09-14 Thread Ramsay Jones
th NO_PTHREADS set). In order to fix the warning, move the (conditional) pthread field to the end of the struct and change the initialiser to use a NULL, since the new (unconditional) first field is a pointer type. Signed-off-by: Ramsay Jones --- Hi Ben, If you need to re-roll your 'bp/rea

[PATCH] midx.c: mark a file-local symbol as static

2018-09-14 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Derrick, If you need to re-roll your 'ds/multi-pack-verify' branch, could you please squash this into the relevant patch (commit 64cbf3df21, "multi-pack-index: add 'verify' verb", 2018-09-13). [noticed by sparse]. Thanks.

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

2018-09-11 Thread Ramsay Jones
items afterwards > using string_list_remove_empty_items. > > By doin so we'll have access to the util pointer for longer that s/doin/doing/ ATB, Ramsay Jones

Re: [PATCH 1/9] string-list: add string_list_{pop, last} functions

2018-09-11 Thread Ramsay Jones
list); > > work_on(item); > string_list_pop(&list); string_list_pop() takes a second int parameter (free_util). ATB, Ramsay Jones

Re: git silently ignores include directive with single quotes

2018-09-08 Thread Ramsay Jones
path = ... I was going to suggest, inspired by Makefile syntax, that [-include] would not complain if the file was missing ... except, of course, it's too late for that! ;-) I suppose [+include] could complain if the file is missing instead, ... dunno. ATB, Ramsay Jones

Re: [PATCH 0/9] worktree: fix bugs and broaden --force applicability

2018-08-31 Thread Ramsay Jones
On 31/08/18 01:54, Jeff King wrote: > On Fri, Aug 31, 2018 at 12:49:39AM +0100, Ramsay Jones wrote: > >> On 30/08/18 21:14, Junio C Hamano wrote: >>> Jeff King writes: >>> >>>> I suppose so. I don't think I've _ever_ used distclean, an

Re: [PATCH 0/9] worktree: fix bugs and broaden --force applicability

2018-08-30 Thread Ramsay Jones
make distclean; done" > sometimes before running "git clean -x" ;-) > 'git clean -x' always removes _way_ more than I want it to - in particular, I lost my config.mak more than once. So, no I don't trust it. ;-) ATB, Ramsay Jones

Re: Missing Tagger Entry

2018-08-29 Thread Ramsay Jones
= .git/skip 2) Add the object-id of the v0.99 tag to the skiplist file: $ echo d6602ec5194c87b0fc87103ca4d67251c76f233a >.git/skip Hope this helps. ATB, Ramsay Jones

Re: [PATCHv4 0/6] Add missing includes and forward declares

2018-08-15 Thread Ramsay Jones
I, -D, etc); which flags did you pass to the compiler? Well, it killed 15min. before bed! ;-) ATB, Ramsay Jones -- >8 -- Subject: [PATCH] Makefile: add a hdr-check target Signed-off-by: Ramsay Jones --- Makefile | 10 ++ 1 file changed, 10 insertions(+) diff --git a/Makefile b/Make

Re: [PATCH v4 1/7] Add delta-islands.{c,h}

2018-08-13 Thread Ramsay Jones
On 13/08/18 04:33, Christian Couder wrote: > On Mon, Aug 13, 2018 at 3:14 AM, Ramsay Jones [snip] >> And neither the sha1 or str hash-maps are destroyed here. >> (That is not necessarily a problem, of course! ;-) ) > > The instances are declared as static: >

Re: [PATCH v4 1/7] Add delta-islands.{c,h}

2018-08-12 Thread Ramsay Jones
(island_marks)) { > + struct commit_list *p; > + struct island_bitmap *root_marks = kh_value(island_marks, pos); > + > + parse_commit(commit); > + set_island_marks(&get_commit_tree(commit)->object, root_marks); > + for (p = commit->parents; p; p = p->next) > + set_island_marks(&p->item->object, root_marks); > + } > +} > + > +int compute_pack_layers(struct packing_data *to_pack) > +{ > + uint32_t i; > + > + if (!core_island_name || !island_marks) > + return 1; > + > + for (i = 0; i < to_pack->nr_objects; ++i) { > + struct object_entry *entry = &to_pack->objects[i]; > + khiter_t pos = kh_get_sha1(island_marks, entry->idx.oid.hash); > + > + entry->layer = 1; > + > + if (pos < kh_end(island_marks)) { > + struct island_bitmap *bitmap = kh_value(island_marks, > pos); > + > + if (island_bitmap_get(bitmap, island_counter_core)) > + entry->layer = 0; > + } > + } > + > + return 2; > +} > diff --git a/delta-islands.h b/delta-islands.h > new file mode 100644 > index 00..f9725730f4 > --- /dev/null > +++ b/delta-islands.h > @@ -0,0 +1,11 @@ > +#ifndef DELTA_ISLANDS_H > +#define DELTA_ISLANDS_H > + > +int island_delta_cmp(const struct object_id *a, const struct object_id *b); > +int in_same_island(const struct object_id *, const struct object_id *); > +void resolve_tree_islands(int progress, struct packing_data *to_pack); > +void load_delta_islands(void); > +void propagate_island_marks(struct commit *commit); > +int compute_pack_layers(struct packing_data *to_pack); > + > +#endif /* DELTA_ISLANDS_H */ > diff --git a/pack-objects.h b/pack-objects.h > index edf74dabdd..8eecd67991 100644 > --- a/pack-objects.h > +++ b/pack-objects.h > @@ -100,6 +100,10 @@ struct object_entry { > unsigned type_:TYPE_BITS; > unsigned no_try_delta:1; > unsigned in_pack_type:TYPE_BITS; /* could be delta */ > + > + unsigned int tree_depth; /* should be repositioned for packing? */ > + unsigned char layer; > + > unsigned preferred_base:1; /* > * we do not pack this, but is available > * to be used as the base object to delta > Sorry, I spent so long reading this patch, I have run out of time tonight (and I am busy tomorrow) to read the rest of the series. ATB, Ramsay Jones

function get_delta_base() is a file-local symbol

2018-08-11 Thread Ramsay Jones
eries adds any such call. Do you have plans to extend that series with additional patches which will add such calls? ATB, Ramsay Jones

[PATCH] rebase: fix a sparse 'plain integer as NULL pointer' warning

2018-08-11 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Pratik, If you need to re-roll your 'pk/rebase-in-c-4-opts' branch, could you please squash this into the relevant patch (commit b0721e7b48, "builtin rebase: support `-C` and `--whitespace=`", 2018-08-08). Thanks! ATB, Ramsay Jones

Re: [PATCHv2 3/6] Move definition of enum branch_track from cache.h to branch.h

2018-08-11 Thread Ramsay Jones
;cache.h" ... after here. > #include "config.h" > #include "repository.h" > diff --git a/environment.c b/environment.c > index 6cf0079389..920362900c 100644 > --- a/environment.c > +++ b/environment.c > @@ -7,6 +7,7 @@ > * even if you might want to know where the git directory etc > * are. > */ > +#include "branch.h" ditto > #include "cache.h" > #include "repository.h" > #include "config.h" > ATB, Ramsay Jones

Re: [PATCH 2/2] fsck: use oidset for skiplist

2018-08-11 Thread Ramsay Jones
or error_func; > unsigned strict:1; > int *msg_type; > -    struct oid_array *skiplist; > +    struct oidset skiplist; > struct decoration *object_names; >  }; >   > -#define FSCK_OPTIONS_DEFAULT { NULL, fsck_error_function, 0, NULL } > -#define FSCK_O

Re: [PATCH 1/6] add, update-index: fix --chmod argument help

2018-08-02 Thread Ramsay Jones
t be added because of errors")), > OPT_BOOL( 0 , "ignore-missing", &ignore_missing, N_("check if - even > missing - files are ignored in dry run")), > - OPT_STRING( 0 , "chmod", &chmod_arg, N_("(+/-)x"), N_("override the

Re: [PATCH 2/3] config: fix case sensitive subsection names on writing

2018-08-01 Thread Ramsay Jones
On 01/08/18 20:34, Stefan Beller wrote: > A use reported a submodule issue regarding strange case indentation s/use/user/ ? ATB, Ramsay Jones

[PATCH] builtin.h: remove declaration of cmd_rebase__helper

2018-07-29 Thread Ramsay Jones
Commit 94d4e2fb88 ("rebase -i: move rebase--helper modes to rebase--interactive", 2018-07-24) removed the definition of the 'cmd_rebase__helper' symbol, but forgot to remove the corresponding declaration in the 'builtin.h' header file. Signed-off-by: Ramsay Jones

Re: [PATCH] t5562: avoid non-portable "export FOO=bar" construct

2018-07-29 Thread Ramsay Jones
On 29/07/18 04:13, Eric Sunshine wrote: > On Sat, Jul 28, 2018 at 6:51 PM Ramsay Jones > wrote: >> Commit 6c213e863a ("http-backend: respect CONTENT_LENGTH for >> receive-pack", 2018-07-27) adds a test which uses the non-portable >> export construct. Repl

[PATCH] t5562: avoid non-portable "export FOO=bar" construct

2018-07-28 Thread Ramsay Jones
Commit 6c213e863a ("http-backend: respect CONTENT_LENGTH for receive-pack", 2018-07-27) adds a test which uses the non-portable export construct. Replace it with "FOO=bar && export FOO" instead. Signed-off-by: Ramsay Jones --- Hi Junio, Could you please put

Re: [PATCH 00/16] Consolidate reachability logic

2018-07-16 Thread Ramsay Jones
I hate it), be even with that turned on, the patches still appear in the above order under the cover letter (but at least all together). Annoyed. ATB, Ramsay Jones

Re: [PATCH] fsck: check skiplist for object in fsck_blob()

2018-07-13 Thread Ramsay Jones
re > slightly redundant (well, not redundant if you're into black-box > testing, but our current tests are usually written with an assumption of > where the module boundaries are, and what is likely to be a problem). I don't mind either way. I will let you and Junio decide. Thanks! ATB, Ramsay Jones

Re: [PATCH] fsck: check skiplist for object in fsck_blob()

2018-07-13 Thread Ramsay Jones
On 11/07/18 20:31, Ramsay Jones wrote: > On 07/07/18 02:32, Jeff King wrote: [snip] >> Hmm, we seem to have "info" these days, so maybe that would do what I >> want. I.e., I wonder if the patch below does everything we'd want. It's >> late here and I pro

[PATCH] ref-filter: mark some file-local symbols as static

2018-07-12 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Olga, If you need to re-roll your 'ot/ref-filter-object-info' branch, could you please squash this into the relevant patch (commit c5d9a471d6, "ref-filter: use oid_object_info() to get object", 2018-07-09). [Both sparse and my static

[PATCH] t6036: fix broken && chain in sub-shell

2018-07-12 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Junio, I had a test failure on 'pu' today - Eric's chain-lint series found another broken chain in one of Elijah's new tests (on the 'en/t6036-recursive-corner-cases' branch). ATB, Ramsay Jones t/t6036-recursive-corner-case

Re: [PATCH] fsck: check skiplist for object in fsck_blob()

2018-07-11 Thread Ramsay Jones
; /* infos (reported as warnings, but ignored by default) */ \ > FUNC(BAD_TAG_NAME, INFO) \ > + FUNC(GITMODULES_PARSE, INFO) \ > FUNC(MISSING_TAGGER_ENTRY, INFO) > > #define MSG_ID(id, msg_type) FSCK_MSG_##id, > So, just squinting at this in my email client, if this allowed a push/fetch to succeed (along with an 'info' message), while providing an admin the means to configure it to loudly deny the push/fetch - then I think we have a winner! ;-) Sorry for not testing the patch. ATB, Ramsay Jones

Re: [PATCH] fsck: check skiplist for object in fsck_blob()

2018-07-03 Thread Ramsay Jones
On 03/07/18 15:34, Jeff King wrote: > On Fri, Jun 29, 2018 at 02:10:59AM +0100, Ramsay Jones wrote: > >> On 28/06/18 23:03, Jeff King wrote: >>> On Thu, Jun 28, 2018 at 07:53:27PM +0100, Ramsay Jones wrote: >> [snip] >>> Yes, it can go in quickly. But I

Re: [PATCH 4/4] fsck: silence stderr when parsing .gitmodules

2018-06-28 Thread Ramsay Jones
gt; But that seems even more far-fetched. And it _is_ dangerous to leave, > because I think existing vulnerable clients will try to load a 500MB > .gitmodules file in memory and parse it. I also applied and tested the patch below. I think this patch must be included in the series. ATB, Ramsay

Re: [PATCH] fsck: check skiplist for object in fsck_blob()

2018-06-28 Thread Ramsay Jones
On 28/06/18 23:03, Jeff King wrote: > On Thu, Jun 28, 2018 at 07:53:27PM +0100, Ramsay Jones wrote: [snip] > Yes, it can go in quickly. But I'd prefer not to keep it in the long > term if it's literally doing nothing. Hmm, I don't think you can say its doing nothing!

Re: [PATCH] fsck: check skiplist for object in fsck_blob()

2018-06-28 Thread Ramsay Jones
On 28/06/18 18:45, Jeff King wrote: > On Thu, Jun 28, 2018 at 05:56:18PM +0100, Ramsay Jones wrote: [snip] >>> One thing we could do is turn the parse failure into a noop. The main >>> point of the check is to protect people against the malicious >>> .gitmodules bu

Re: [PATCH] fsck: check skiplist for object in fsck_blob()

2018-06-28 Thread Ramsay Jones
On 28/06/18 12:49, Jeff King wrote: > On Wed, Jun 27, 2018 at 07:39:53PM +0100, Ramsay Jones wrote: > >> Since commit ed8b10f631 ("fsck: check .gitmodules content", 2018-05-02), >> fsck will issue an error message for '.gitmodules' content that cannot &g

[PATCH] fsck: check skiplist for object in fsck_blob()

2018-06-27 Thread Ramsay Jones
ct, a simpler approach is to just not call the config parser if the object is to be skipped. Add a check to the 'fsck_blob()' processing function, to determine if the object is on the skiplist and, if so, exit the function early. Signed-off-by: Ramsay Jones --- Hi Junio, I noticed recent

[PATCH] diff: fix a sparse 'dubious one-bit signed bitfield' error

2018-06-23 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Stefan, If you need to re-roll your 'sb/diff-color-move-more' branch, could you please squash this into the relevant patch (commit f2d78d2c67, "diff.c: add white space mode to move detection that allows indent changes", 2018-06-21).

[PATCH] ewah: delete unused 'rlwit_discharge_empty()'

2018-06-19 Thread Ramsay Jones
From: Junio C Hamano Complete the removal of unused 'ewah bitmap' code by removing the now unused 'rlwit_discharge_empty()' function. Also, the 'ewah_clear()' function can now be made a file-scope static symbol. Signed-off-by: Ramsay Jones --- Hi Junio, Can

Re: [PATCH 2/8] ewah/bitmap.c: delete unused 'bitmap_each_bit()'

2018-06-15 Thread Ramsay Jones
On 15/06/18 15:30, Derrick Stolee wrote: > Reported-by: Ramsay Jones > Signed-off-by: Derrick Stolee > --- > ewah/bitmap.c | 24 > 1 file changed, 24 deletions(-) > > diff --git a/ewah/bitmap.c b/ewah/bitmap.c > index d61dc6114a..52f117

Re: [PATCH 8/8] ewah_io: delete unused 'ewah_serialize_native()'

2018-06-15 Thread Ramsay Jones
On 15/06/18 15:30, Derrick Stolee wrote: > Signed-off-by: Derrick Stolee > --- > ewah/ewah_io.c | 26 -- > ewah/ewok.h| 1 - > 2 files changed, 27 deletions(-) This duplicates Jeff's patch #3. ATB, Ramsay Jones

Re: [PATCH 1/8] ewah/bitmap.c: delete unused 'bitmap_clear()'

2018-06-15 Thread Ramsay Jones
On 15/06/18 15:30, Derrick Stolee wrote: > Reported-by: Ramsay Jones > Signed-off-by: Derrick Stolee > --- > ewah/bitmap.c | 8 > 1 file changed, 8 deletions(-) > > diff --git a/ewah/bitmap.c b/ewah/bitmap.c > index 756bdd050e..d61dc6114a 100644 > --- a

Re: [PATCH 3/3] ewah: drop ewah_serialize_native function

2018-06-15 Thread Ramsay Jones
On 15/06/18 14:56, Ramsay Jones wrote: > > > On 15/06/18 04:32, Jeff King wrote: >> We don't call this function, and never have. The on-disk >> bitmap format uses network-byte-order integers, meaning that >> we cannot use the native-byte-order format written

Re: [PATCH 3/3] ewah: drop ewah_serialize_native function

2018-06-15 Thread Ramsay Jones
n to these *(de)serialize* functions. ;-) ATB, Ramsay Jones

Re: [PATCH v7 2/2] json-writer: t0019: add Python unit test

2018-06-07 Thread Ramsay Jones
On 07/06/18 03:23, Jeff King wrote: > On Thu, Jun 07, 2018 at 01:16:14AM +0100, Ramsay Jones wrote: > >>> Probably. We may want to go the same route as we did for perl in >>> a0e0ec9f7d (t: provide a perl() function which uses $PERL_PATH, >>> 2013-10-28) s

Re: [PATCH v7 2/2] json-writer: t0019: add Python unit test

2018-06-06 Thread Ramsay Jones
$git/$file" >"$scrub" && t/t9810-git-p4-rcs.sh: "$PYTHON_PATH" "$TRASH_DIRECTORY/scrub_ko.py" <"$git/$file" >"$scrub" && $ I don't run the p4 or svn tests, so ... :-D > really the only user in the whole code base outside of a few fringe > commands). Leaving aside any perl vs python flame-war, I think there's > value in keeping the number of languages limited when there's not a > compelling reason to do otherwise. I agree that fewer languages is (generally) a good idea. ATB, Ramsay Jones

Re: [PATCH v3 07/20] attr: remove an implicit dependency on the_index

2018-06-06 Thread Ramsay Jones
se the right index instead of the_index. > > There is one ugly temporary workaround added in attr.c that needs some > more explanation. > > Commit c24f3abace (apply: file commited * with CRLF should roundtrip s/commited * with/commited with/ ATB, Ramsay Jones

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

2018-06-05 Thread Ramsay Jones
shallow-info | wanted-refs | packfile) > (flush-pkt | delim-pkt) > > acknowledgments = PKT-LINE("acknowledgments" LF) > @@ -319,6 +328,10 @@ header. > shallow = "shallow" SP obj-id > unshallow = "unshallow" SP obj-id > > +wanted-refs = PKT-LINE("wanted-refs" LF) > + *PKT-Line(wanted-ref LF) s/PKT-Line/PKT-LINE/ ATB, Ramsay Jones

Re: [PATCH 4/6] unpack-tress: convert clear_ce_flags* to avoid the_index

2018-06-05 Thread Ramsay Jones
t; return nr - (cache_end - cache); > } > > -static int clear_ce_flags(struct cache_entry **cache, int nr, > - int select_mask, int clear_mask, > - struct exclude_list *el) > +static int clear_ce_flags(struct index_state *istate, > + int select_mask, int clear_mask, > + struct exclude_list *el) OK, so that last hunk of patch #3 should be moved to the end of this patch. (A 'git rebase -i' problem?) ATB, Ramsay Jones

Re: [PATCH 3/6] unpack-trees: don't shadow global var the_index

2018-06-05 Thread Ramsay Jones
> -select_flag, skip_wt_flag, el); > + clear_ce_flags(istate, select_flag, skip_wt_flag, el); This looks a bit suspect. The clear_ce_flags() function has not been modified to take a 'struct index_state *' as its first parameter, right? (If you look back at the first hunk header, you will see that it still takes 'struct cache_entry **, int, ...') ;-) ATB, Ramsay Jones

Re: [PATCH v7 2/2] http-backend: respect CONTENT_LENGTH for receive-pack

2018-06-04 Thread Ramsay Jones
case) is needed? As far as I can see n > returns straight from system's read() ATB, Ramsay Jones

Re: [RFC PATCH 4/7] merge-recursive: fix assumption that head tree being merged is HEAD

2018-06-03 Thread Ramsay Jones
On 04/06/18 00:37, brian m. carlson wrote: > On Sun, Jun 03, 2018 at 02:52:12PM +0100, Ramsay Jones wrote: >> On 03/06/18 07:58, Elijah Newren wrote: >>> I'm really unsure where the index_has_changes() declaration should go; >>> I stuck it in tree.h, but is there

Re: [RFC PATCH 4/7] merge-recursive: fix assumption that head tree being merged is HEAD

2018-06-03 Thread Ramsay Jones
dex_has_changes() declaration should go; > I stuck it in tree.h, but is there a better spot? Err, leave it where it is and '#include "tree.h"' ? :-D ATB, Ramsay Jones

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

2018-05-29 Thread Ramsay Jones
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 wa

Re: symbol string_list_appendf() unused

2018-05-21 Thread Ramsay Jones
On 22/05/18 00:59, Junio C Hamano wrote: > Ramsay Jones writes: > >> I strongly suspect that I haven't followed the discussion on >> the list closely enough, but your 'ma/unpack-trees-free-msgs' >> branch in 'pu', seems to define string_list_app

symbol string_list_appendf() unused

2018-05-21 Thread Ramsay Jones
: provide `string_list_appendf()`", 2018-05-20) claiming that: 'The next commit will add a user'. ;-) Have I missed something? ATB, Ramsay Jones

Re: [PATCH v2 13/14] merge: use commit-slab in merge remote desc instead of commit->util

2018-05-18 Thread Ramsay Jones
plain? Indeed, it already did (see [1]). ;-) Your fixup, commit dc2172daed, on the 'nd/commit-util-to-slab' branch has indeed fixed it up. Thanks! [1] https://public-inbox.org/git/e2c4276f-bcfd-faaa-f9ee-cb50e99da...@ramsayjones.plus.com/ ATB, Ramsay Jones

[PATCH] shallow: remove unused variable

2018-05-16 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Stefan, If you need to re-roll your 'sb/object-store-grafts' branch, could you please squash this into the relevant patch (whichever one that would be)! ;-) I have not looked to see which patch needs to change (just being lazy, sorry!), but this va

[PATCH] refspec.h: reinstate 'extern' to fix sparse warning

2018-05-16 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Brandon, If you need to re-roll your 'bw/refspec-api' branch, could you please squash this, or the equivalent change before the 'struct refname' to 'struct refname_item' name change, into the relevant patch. (which would be patc

[PATCH] commit: fix sparse 'not declared' warning

2018-05-14 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Duy, If you need to re-roll your 'nd/commit-util-to-slab' branch, could you please squash this into the relevant patch (commit 37de2f0a93, "merge: use commit-slab in merge remote desc instead of commit->util", 2018-05-13). Also, my &

[PATCH] BUG_exit_code: fix sparse "symbol not declared" warning

2018-05-09 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Johannes, If you need to re-roll your 'js/use-bug-macro' branch, could you please squash this into the relevant patch (commit a86303cb5d, "test-tool: help verifying BUG() code paths", 2018-05-02). This will, obviously, not be req

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-09 Thread Ramsay Jones
lved in setting up a 'ppa repo' for Ubuntu, which I suspect is the kind of thing you want, but it would have helped me several times in the past (so that I could have something to point people to) ... ;-) ATB, Ramsay Jones

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-04 Thread Ramsay Jones
his tool will be very useful (thanks also go to Thomas, of course). I noticed that there seemed to be an occasional 'whitespace error' indicator (red background) directly after an +/- change character which I suspect is an error (I haven't actually checked). However, this indicator disappears if you add the --dual-color option. Thanks! ATB, Ramsay Jones

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-03 Thread Ramsay Jones
On 03/05/18 21:25, Johannes Schindelin wrote: > On Thu, 3 May 2018, Ramsay Jones wrote: >> On 03/05/18 16:30, Johannes Schindelin wrote: [snip] >>> diff --git a/builtin/branch-diff.c b/builtin/branch-diff.c >>> new file mode 100644 >>> index 00

Re: [PATCH 03/18] branch-diff: first rudimentary implementation

2018-05-03 Thread Ramsay Jones
..B C..D | A...B | base A B )"), > NULL > }; > > -#define COLOR_DUAL_MODE 2 > - This #define was introduced in the previous patch, without being used in that patch, and is now deleted here. ATB, Ramsay Jones

Re: [PATCH 02/18] Add a new builtin: branch-diff

2018-05-03 Thread Ramsay Jones
const char *prefix); > diff --git a/builtin/branch-diff.c b/builtin/branch-diff.c > new file mode 100644 > index 000..97266cd326d > --- /dev/null > +++ b/builtin/branch-diff.c > @@ -0,0 +1,40 @@ > +#include "cache.h" > +#include "parse-options.h" > + > +static const char * const builtin_branch_diff_usage[] = { > + N_("git rebase--helper [] ( A..B C..D | A...B | base A B )"), s/rebase--helper/branch-diff/ ATB, Ramsay Jones

Re: [PATCH 1/5] submodule foreach: correct '$path' in nested submodules from a subdirectory

2018-05-03 Thread Ramsay Jones
ed in 091a6eb0fe (submodule: drop the > top-level requirement, 2013-06-16) the intent for $path seemed to be > relative to $cwd to the submodule worktree, but that did not work for > nested submodules, as the intermittent submodules were not included in intermediate ATB, Ramsay Jones

Re: [PATCH v3 0/6] Keep all info in command-list.txt in git binary

2018-04-22 Thread Ramsay Jones
On 22/04/18 17:12, Duy Nguyen wrote: > On Sun, Apr 22, 2018 at 5:58 PM, Ramsay Jones > wrote: >>>> I think you need to try a little harder than this! ;-) >>> >>> Yeah. I did think about grepping the output but decided not to because >>> of gettex

Re: [PATCH v3 0/6] Keep all info in command-list.txt in git binary

2018-04-22 Thread Ramsay Jones
On 22/04/18 16:22, Duy Nguyen wrote: > On Sun, Apr 22, 2018 at 4:45 PM, Ramsay Jones > wrote: >> >> >> On 21/04/18 17:56, Duy Nguyen wrote: >>> On Sat, Apr 21, 2018 at 06:54:08PM +0200, Nguyễn Thái Ngọc Duy wrote: >>>> Changes: >>>> &g

<    1   2   3   4   5   6   7   8   9   10   >