[PATCH] xemit.c: fix a [-Wchar-subscripts] compiler warning

2016-05-25 Thread Ramsay Jones
ter 'rec' to an 'unsigned char *' pointer, prior to passing the dereferenced pointer to the isspace() macro. Signed-off-by: Ramsay Jones --- Hi René, If you need to re-roll your 'rs/xdiff-hunk-with-func-line' branch, could you please squash this (or something like it) i

Re: [PATCH] clone: don't use an integer as a NULL pointer

2016-05-25 Thread Ramsay Jones
On 26/05/16 00:30, Stefan Beller wrote: > On Wed, May 25, 2016 at 4:12 PM, Ramsay Jones > wrote: >> >> Signed-off-by: Ramsay Jones >> --- >> >> Hi Stefan, >> >> If you need to re-roll your 'sb/submodule-default-paths' branch, could

[PATCH] log: document the --decorate=auto option

2016-05-27 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Junio, While reading an email from Linus earlier (RFC: dynamic "auto" date formats), I noticed that log.decorate was being set to 'auto'. Since I didn't recall that setting (even if it's easy to guess), I went looking for the d

Re: [PATCH 09/13] refs: introduce an iterator interface

2016-05-30 Thread Ramsay Jones
gt;levels_nr + 1, > +iter->levels_alloc); > + > + level = &iter->levels[iter->levels_nr++]; > + level->dir = get_ref_dir(entry); > + sort_ref_dir(level->dir); ... given that

Re: [PATCH 09/13] refs: introduce an iterator interface

2016-05-30 Thread Ramsay Jones
On 30/05/16 16:22, Ramsay Jones wrote: > > > On 30/05/16 08:55, Michael Haggerty wrote: > [snip] > >> /* Reference is a symbolic reference. */ >> diff --git a/refs/files-backend.c b/refs/files-backend.c >> index 8ab4d5f..dbf1587 100644 >> --- a/r

Re: [PATCH] t4014: shell portability fix

2016-05-31 Thread Ramsay Jones
test_commit exotic && > + (export GIT_AUTHOR_NAME="éxötìc"; test_commit exotic) && Isn't 'export VAR=VAL' non-portable? So, maybe: (GIT_AUTHOR_NAME="éxötìc"; export GIT_AUTHOR_NAME; test_commit exotic) && > test_

Re: [RFC/PATCH] pathspec: allow escaped query values

2016-06-01 Thread Ramsay Jones
u don't need to quote them in the part of the -spec. (I dunno, maybe use ; or : instead?) ATB, Ramsay Jones -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [RFC/PATCH] pathspec: allow escaped query values

2016-06-02 Thread Ramsay Jones
On 02/06/16 06:46, Junio C Hamano wrote: > Ramsay Jones writes: > >> Not having given this much thought at all, but the question which comes >> to mind is: can you use some other separator for the -s rather than >> a comma? That way you don't need to quote them

Re: [RFC/PATCH] pathspec: allow escaped query values

2016-06-02 Thread Ramsay Jones
On 02/06/16 17:10, Junio C Hamano wrote: > Ramsay Jones writes: > >> So, at risk of annoying you, let me continue in my ignorance a little >> longer and ask: even if you have to protect all of this 'magic' from >> the shell with '/" quoting, could y

Re: [RFC/PATCH] pathspec: allow escaped query values

2016-06-02 Thread Ramsay Jones
On 02/06/16 20:04, Stefan Beller wrote: > On Thu, Jun 2, 2016 at 11:42 AM, Ramsay Jones > wrote: >> >> >> On 02/06/16 17:10, Junio C Hamano wrote: >>> Ramsay Jones writes: >>> >>>> So, at risk of annoying you, let me continue in my ignor

Re: [RFC/PATCH] pathspec: allow escaped query values

2016-06-02 Thread Ramsay Jones
On 02/06/16 20:29, Junio C Hamano wrote: > Junio C Hamano writes: > >> On Thu, Jun 2, 2016 at 11:42 AM, Ramsay Jones >> wrote: >>>> >>>> That would be workable, I would think. Before attr:VAR=VAL >>>> extention, supported pathspec wer

Re: [RFC/PATCH] pathspec: allow escaped query values

2016-06-02 Thread Ramsay Jones
On 02/06/16 20:46, Junio C Hamano wrote: > Ramsay Jones writes: > >> I think Junio wants to go with just " quoting (see other thread). > > No. I meant just \ quoting. Yes, sorry, I only just read your last email on the other thread. ATB, Ramsay Jones -- To uns

Re: [PATCH v4 1/6] worktree.c: add find_worktree()

2016-06-03 Thread Ramsay Jones
((*list)->path))) The results of the call to real_path() should probably be cached in the worktree structure, since real_path() is relatively expensive (it calls chdir(), lstat(), readlink() etc.), so you don't want to re-compute the same result time-after-time ... > +

Re: [PATCH 01/10] builtin/commit.c: convert trivial snprintf calls to xsnprintf

2016-06-03 Thread Ramsay Jones
> /* >* Let the hook know that no editor will be launched. >*/ > if (!editor_is_used) > - hook_env[1] = "GIT_EDITOR=:"; > + argv_array_push(&hook_env, "GIT_EDITOR=:"); > > va_start(args, nam

Re: [PATCH 02/10] builtin/index-pack.c: convert trivial snprintf calls to xsnprintf

2016-06-03 Thread Ramsay Jones
> read the whole function, because "report" is always a 4-char string). > Yuck. At least there should be a comment explaining why 48 is big > enough. Agreed, again I would use something like: char buf[GIT_SHA1_HEXSZ + 7]; /* 40 (sha1) + 4 (report) + 3 (\t\n\0

Re: [PATCH 03/10] builtin/tag.c: convert trivial snprintf calls to xsnprintf

2016-06-03 Thread Ramsay Jones
my "type 2" cases. I'd argue it should be using a > heap buffer to handle tag and tagger names of arbitrary size. Yep. As it stands, the code following this hunk: if (header_len > sizeof(header_buf) - 1) die(_("tag header too big."

[PATCH] regex: fix a SIZE_MAX macro redefinition warning

2016-06-03 Thread Ramsay Jones
rt systems which do not have the header (the HAVE_STDINT_H macro is not defined). In order to suppress the warning, we remove the #include of from regcomp.c and set the HAVE_STDINT_H macro, using the regex.o build rule within the Makefile, to ensure that is #included from the regex_internal.h header

Re: [PATCH] regex: fix a SIZE_MAX macro redefinition warning

2016-06-05 Thread Ramsay Jones
On 05/06/16 08:15, Johannes Schindelin wrote: > Hi Ramsay, > > thanks for working on this! > > On Sat, 4 Jun 2016, Ramsay Jones wrote: > >> diff --git a/Makefile b/Makefile >> index 0d59718..3f6c70a 100644 >> --- a/Makefile >> +++ b/Makefile >

[PATCH v2] regex: fix a SIZE_MAX macro redefinition warning

2016-06-06 Thread Ramsay Jones
rt systems which do not have the header (the HAVE_STDINT_H macro is not defined). In order to suppress the warning, we move the #include of from regcomp.c to the start of the compilation unit, close to the top of regex.c, prior to the #include of the regex_internal.h header. Signed-off-by: Ramsay Jones --

[PATCH] refs: mark the file-local vtable symbols as static

2016-06-08 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Michael, Junio, I would normally ask you to squash this into the relevant patch when you next re-roll your 'mh/ref-iterators' branch, but this has already been merged into next. (I normally have a bit more time ... sorry!). Perhaps, after the rel

Re: [PATCH] send-pack: use buffered I/O to talk to pack-objects

2016-06-09 Thread Ramsay Jones
1[i], po.in, 1)) >> -break; >> +feed_object(extra->sha1[i], po_in, 1); > > I may have missed the obvious, but doesn't this change the behavior when > "negative && !has_sha1_file(sha1)" happens? I understand that you don'

Re: [PATCH] send-pack: use buffered I/O to talk to pack-objects

2016-06-09 Thread Ramsay Jones
On 09/06/16 18:12, Jeff King wrote: > On Thu, Jun 09, 2016 at 03:34:59PM +0100, Ramsay Jones wrote: > >> Just FYI, this patch removes the last use of write_or_whine() - should it >> be removed? > > That sounds reasonable. Want to do a patch on top? OK, will do. A

[PATCH] write_or_die: remove the unused write_or_whine() function

2016-06-09 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Junio, Commit f0bca72d ("send-pack: use buffered I/O to talk to pack-objects", 08-06-2016) removed the last use of write_or_whine(). I had intended to include this 'commit citation' in the commit message, but until it reaches the next bran

[PATCH] run-command: mark file-local symbols static

2016-06-17 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Jeff, If you need to re-roll your 'jk/gpg-interface-cleanup' branch, could you please squash this into the relevant patch (commit 74287e34, "run-command: add pipe_command helper", 16-06-2016). BTW, also on that branch, commit 6fec0a89 (&

[PATCH] archive-tar: add UL type suffix to unsigned long constant

2016-06-17 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Jeff, If you need to re-roll your 'jk/big-and-old-archive-tar' branch, could you please squash this into the relevant patch (commit 8035a1e3, "archive-tar: write extended headers for far-future mtime", 16-06-2016). Thanks! ATB, Ramsay J

Re: [PATCH] run-command: mark file-local symbols static

2016-06-17 Thread Ramsay Jones
On 18/06/16 00:33, Jeff King wrote: > On Fri, Jun 17, 2016 at 10:01:24PM +0100, Ramsay Jones wrote: > >> If you need to re-roll your 'jk/gpg-interface-cleanup' branch, could >> you please squash this into the relevant patch (commit 74287e34, >> "run-comman

Re: [PATCH] archive-tar: add UL type suffix to unsigned long constant

2016-06-17 Thread Ramsay Jones
On 18/06/16 00:40, Jeff King wrote: > On Fri, Jun 17, 2016 at 10:06:14PM +0100, Ramsay Jones wrote: > >> If you need to re-roll your 'jk/big-and-old-archive-tar' branch, could >> you please squash this into the relevant patch (commit 8035a1e3, >> "arch

[PATCH] submodule: mark a file-local symbol as static

2016-08-11 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Stefan, If you need to re-roll your 'sb/submodule-clone-rr' branch, could you please squash this into the relevant patch (commit 336c21d, "submodule: try alternates when superproject has an alternate", 08-08-2016). Thanks! ATB, Ra

[PATCH] submodule: mark a file-local symbol as static

2016-08-14 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Stefan, If you need to re-roll your 'sb/submodule-clone-rr' branch, could you please squash this into the relevant patch (commit 7bcd1d17, "clone: recursive and reference option triggers submodule alternates", 11-08-2016). Thanks! [What

[PATCH] diff: mark a file-local symbol static

2016-08-24 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Michael, If you need to re-roll your 'mh/diff-indent-heuristic' branch, could you please squash this into the relevant patch (commit 8f5cc189, "diff: improve positioning of add/delete blocks in diffs", 22-08-2016). Thanks! ATB, Ramsay Jo

Re: [PATCH v13 10/14] apply: change error_routine when silent

2016-09-04 Thread Ramsay Jones
gt; > apply.c: In function ‘mute_routine’: > apply.c:115:1: error: parameter name omitted > static void mute_routine(const char *, va_list) > ^ > apply.c:115:1: error: parameter name omitted > make: *** [apply.o] Error 1 Yes, this is not C++. ;-) > So I will leave it as is. I think I would prefer to see: static void mute_routine(const char *msg, va_list params) given that it would either be an error-msg or a warning-msg. ATB, Ramsay Jones

Re: [PATCHv4] diff.c: emit moved lines with a different color

2016-09-06 Thread Ramsay Jones
d_entry *b, > + const void *unused) > +{ > + return strcmp(a->line, b->line) && > +a->hash_prev_line == b->hash_prev_line; I doubt it would make much difference, but my knee-jerk reaction to this was to suggest swapping the order of the expression, thus: return a->hash_prev_line == b->hash_prev_line && strcmp(a->line, b->line); ... but perhaps it doesn't read quite so well, and probably wouldn't affect performance much (except in strange edge cases), so it may not be worth it. ATB, Ramsay Jones

Re: [PATCH 2/3] diff_flush_patch_id: stop returning error result

2016-09-07 Thread Ramsay Jones
ability to two diff blobs, ^ Huh? ... to diff two blobs? ATB, Ramsay Jones

Re: [PATCH v2 3/3] Use the newly-introduced regexec_buf() function

2016-09-08 Thread Ramsay Jones
#x27; git grep .fi a ' [where the file a is set up earlier by: echo 'binaryQfile' | q_to_nul >a] commit f96e5673 ("grep: use REG_STARTEND for all matching if available", 22-05-2010) introduced this test and expects ".. NUL characters themselves are not matched in any way". With the native library on cygwin they are matched, with the compat/regex they are not. Indeed, if you use the system 'grep' command (rather than 'git grep'), then it will also not match ... :-D Slightly off topic, but ... ATB, Ramsay Jones

[PATCH] pkt-line: mark a file-local symbol static

2016-09-14 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Lars, If you need to re-roll your 'ls/filter-process' branch, could you please squash this into the relevant patch; commit 2afd9b22 ("pkt-line: add packet_write_gently()", 08-09-2016). [If you think the symbol should be public (I don

[PATCH] run-command: async_exit no longer needs to be public

2016-09-22 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Lars, If you need to re-roll your 'ls/filter-process' branch, could you please squash this into the relevant commit c42a4cbc ("run-command: move check_pipe() from write_or_die to run_command", 20-09-2016). [Note that commit 9658846c (&

Re: [PATCH] run-command: async_exit no longer needs to be public

2016-09-23 Thread Ramsay Jones
t and then start your >>> work from it, though, if we go that route. >> >> Sounds good to me! > > OK, here is what I queued, then. This looks good to me. Thanks! ATB, Ramsay Jones

Re: [RFC PATCH v2] revision: new rev^-n shorthand for rev^n..rev

2016-09-25 Thread Ramsay Jones
--- builtin/rev-parse.c > +++ builtin/rev-parse.c > @@ -292,6 +292,32 @@ static int try_difference(const char *arg) > return 0; > } > > +static int try_parent_exclusion(const char *arg) > +{ > + int ret = 0; > + char *to_rev = NULL; > + char *from_rev = NULL; > + unsigned char to_sha1[20]; > + unsigned char from_sha1[20]; As Matthieu already mentioned, maybe use 'struct object_id' here. > + > + if (parse_parent_exclusion(arg, &to_rev, &from_rev)) > + goto out; > + if (get_sha1_committish(to_rev, to_sha1)) ... then 'to_sha1.hash' here, etc ... ATB, Ramsay Jones

Re: [PATCH v2] gpg-interface: use more status letters

2016-09-28 Thread Ramsay Jones
bad signature, > - "U" for a good signature with unknown validity and "N" for no signature > +- '%G?': show "G" for a good (valid) signature, > + "B" for a bad signature, > + "U" for a good signature with unknown validity, > + "X" for a good expired signature, or good signature made by an expired key, Hmm, this looks odd. Would the following: "X" for a good signature made with an expired key, mean something different? ATB, Ramsay Jones

Re: [PATCH v2] gpg-interface: use more status letters

2016-09-28 Thread Ramsay Jones
has expired, or a good signature made with an expired key, [Although that is still a bit cumbersome.] ATB, Ramsay Jones

[PATCH] tmp-objdir: mark some file local symbols static

2016-10-01 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Jeff, If you need to re-roll your 'jk/quarantine-received-objects' branch, could you please squash this into the relevant patches. [I also note that tmp_objdir_destroy(), declared to be part of the public interface, is not currently called fr

Re: [PATCH v2 1/1] merge-file: let conflict markers match end-of-line style of the context

2016-01-25 Thread Ramsay Jones
> Probably he wrapped it at less than 192 columns per row, though ;-) > ;-) > Seriously again, this longer version might test more, but it definitely > also tests more than what I actually want to test: I am simply interested > to verify that the conflict markers end in CR/LF when app

Re: [PATCH v2 1/1] merge-file: let conflict markers match end-of-line style of the context

2016-01-26 Thread Ramsay Jones
> crlf-diff2.txtQ so that your 'grep "\\.txtQ$"' should select these lines: <<<<<<< crlf-diff1.txtQ ||| crlf-orig.txtQ >>>>>>> crlf-diff2.txtQ whereas my 'grep "^[<=>|].*Q$"' should select these

Re: [PATCH v5 03/10] test-regex: expose full regcomp() to the command line

2016-01-29 Thread Ramsay Jones
fred" >expect && > test-regex "[^={} \t]+" "={}\nfred" EXTENDED NEWLINE >actual && > test_cmp expect actual > ' > >Of course, that doesn't actually work because "\n" in the 'str' &g

Re: [PATCH v3 00/20] refs backend rebase on pu

2016-02-03 Thread Ramsay Jones
read_directory_recursive (dir=dir@entry=0x7fffdc10, base=base@entry=0x54744a "", baselen=baselen@entry=0, untracked=0x0, check_only=check_only@entry=0, simplify=simplify@entry=0x0) at dir.c:1697 #10 0x004b0b67 in read_directory (dir=dir@entry=0x7fffdc10, pa

Re: [PATCH v3 00/20] refs backend rebase on pu

2016-02-04 Thread Ramsay Jones
s which would not output a common symbol for the above and would fail to link with a 'multiple symbol definition' error. [Also note that an external declaration is already in effect from the refs/refs-internal.h header file! ;-) ] ATB, Ramsay Jones -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH] ref-filter.c: don't stomp on memory

2016-02-06 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Karthik, If you need to re-roll your 'kn/ref-filter-atom-parsing' branch, could you please squash this (or something like it) into the relevant patch (commit 6613d5f1, "ref-filter: introduce parsing functions for each valid atom", 31-01-

Re: [PATCH v1] travis-ci: override CFLAGS properly, add -Wdeclaration-after-statement

2016-02-09 Thread Ramsay Jones
27; (ctx:BxV) 1 ERROR:SPACING: space required after that ',' (ctx:OxV) 4 ERROR:SPACING: space required after that ',' (ctx:VxO) 58 ERROR:SPACING: space required after that ',' (ctx:VxV) 1 ERROR:SPACING: space required after that ';' (ctx:WxV

Re: [PATCH v2] config: add '--sources' option to print the source of a config value

2016-02-10 Thread Ramsay Jones
said before, I'm not very good at naming things, but ... Of the two, I *slightly* prefer --show-origin, since I don't think there will be any confusion. However, I think --source may be OK too (for some reason it sounds better than the plural). Another idea may be --show-source. ;-) ATB, Ramsay Jones -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2] config: add '--sources' option to print the source of a config value

2016-02-10 Thread Ramsay Jones
On 10/02/16 15:28, Sebastian Schuberth wrote: > On Wed, Feb 10, 2016 at 1:47 PM, Ramsay Jones > wrote: > >>> Sebastian suggested "--show-origin" as a better option name over >>> "--sources". >>> I still believe "--sources" mi

Re: [PATCH v4 2/3] config: add 'type' to config_source struct that identifies config type

2016-02-15 Thread Ramsay Jones
onfig line 1 in stdin " >expect && So, this looks odd. Using the above would give: fatal: bad config line 1 in file > + echo "[broken" | test_must_fail git config --list --file - >output 2>&1 > && > + test_cmp expect output > +'

Re: [PATCH v4 3/3] config: add '--show-origin' option to print the origin of a config value

2016-02-15 Thread Ramsay Jones
test_cmp expect output > +' > + > +test_expect_success '--show-origin with single file' ' > + cat >expect <<-\EOF && > + file:.git/configuser.local=true > + file:.git/config user.override=local

Re: [PATCH v4 3/3] config: add '--show-origin' option to print the origin of a config value

2016-02-15 Thread Ramsay Jones
On 15/02/16 21:40, Jeff King wrote: > On Mon, Feb 15, 2016 at 09:36:23PM +0000, Ramsay Jones wrote: > >>> +test_expect_success '--show-origin stdin' ' >>> + cat >expect <<-\EOF && >>> + stdin: user.custom=

Re: [PATCH v4 3/3] config: add '--show-origin' option to print the origin of a config value

2016-02-16 Thread Ramsay Jones
On 16/02/16 09:51, Lars Schneider wrote: > > On 15 Feb 2016, at 23:39, Ramsay Jones wrote: > >> >> >> On 15/02/16 21:40, Jeff King wrote: >>> On Mon, Feb 15, 2016 at 09:36:23PM +, Ramsay Jones wrote: >>> >>>>> +test_expect

Re: [PATCH v4 2/3] config: add 'type' to config_source struct that identifies config type

2016-02-16 Thread Ramsay Jones
t; t/t1308-config-set.sh | 4 ++-- >> 5 files changed, 40 insertions(+), 18 deletions(-) > > Looks good to me. > > -Peff > Hi Lars, Could you please squash this into your patch. Thanks! ATB, Ramsay Jones -- >8 -- From: Ramsay Jones Date: Tue, 16 Feb 2016 21:35:41 +0

Re: [PATCH v4 3/3] config: add '--show-origin' option to print the origin of a config value

2016-02-16 Thread Ramsay Jones
On 16/02/16 17:38, Jeff King wrote: > On Tue, Feb 16, 2016 at 04:46:07PM +0000, Ramsay Jones wrote: > >>> OK, I am happy to add the extra code. >> >> Unless I've missed something (quite possible), this patch does not >> need to change. (you have

[PATCH] submodule: don't use an integer as a NULL pointer

2016-02-21 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Stefan, If you need to re-roll your 'sb/submodule-init' branch, could you please squash this into the relevant patch. Thanks! ATB, Ramsay Jones submodule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodule.c b/submodu

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

2016-02-21 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Jeff, If you need to re-roll your 'jk/tighten-alloc' branch, could you please squash this into the relevant patch. (ie. "convert manual allocations to argv_array"). Thanks! ATB, Ramsay Jones daemon.c | 2 +- 1 file changed, 1 inse

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

2016-02-21 Thread Ramsay Jones
On 21/02/16 23:25, Jeff King wrote: > On Sun, Feb 21, 2016 at 05:33:38PM +0000, Ramsay Jones wrote: > >> If you need to re-roll your 'jk/tighten-alloc' branch, could you >> please squash this into the relevant patch. (ie. "convert manual >> allocations to

[RFC PATCH] lmdb: restrict the visibility of some symbols

2016-02-22 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi David, If you need to re-roll your 'dt/refs-backend-lmdb' branch, please consider squashing something like this into the relevant patches. Note that I marked this as RFC, because I haven't got lmdb installed, so I can't actually test it

[PATCH] refs: reduce the visibility of do_for_each_ref()

2016-02-22 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi David, Again, If you need to re-roll your 'dt/refs-backend-lmdb' branch ... Thanks! ATB, Ramsay Jones refs.c | 16 refs/refs-internal.h | 6 -- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git

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

2016-02-22 Thread Ramsay Jones
On 22/02/16 21:18, Jeff King wrote: > On Mon, Feb 22, 2016 at 12:33:23AM +0000, Ramsay Jones wrote: > >>> Thanks, will do. You notice these with sparse, as I recall? I've meant >>> to look into running that myself, but it looks like we are not >>> war

Re: [PATCH v6 00/32] refs backend

2016-02-24 Thread Ramsay Jones
On 24/02/16 22:58, David Turner wrote: > This version incorporates fixes for function scope from Ramsay Jones. > > It breaks patches down a bit more, to make them easier to review and > understand. Michael Haggerty had some suggestions here. > > As suggested by Duy Nguye

[PATCH] fetch: mark a file-local symbol as static

2016-02-24 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Duy, If you need to re-roll your 'nd/shallow-deepen' branch, could you please squash this into the relevant patch (ie "fetch: define shallow boundary with --shallow-exclude", 23-02-2016). Thanks! ATB, Ramsay Jones builtin/fetch.c |

[PATCH] refs: mark a file-local symbol as static

2016-02-25 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi David, No, you are not having flashbacks - you forgot to make the register_ref_storage_backend() function static. ;-) BTW, I still have two symbols showing as exported but not used, namely: $ diff nsc psc1 ... 32a35,36 > ref

[PATCH] run-command: fix an 'different modifiers' sparse warning

2016-02-25 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Jeff, If you need to re-roll your 'jk/epipe-in-async' branch, could you please squash this into the relevant patch. (ie. "write_or_die: handle EPIPE in async threads", 24-02-2016). Thanks! ATB, Ramsay Jones run-command.c | 4 ++-

[PATCH] submodule--helper: fix 'dubious bitfield' sparse warnings

2016-02-25 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Stefan, If you need to re-roll (err, one of your) 'sb/submodule-parallel-update' branches, could you please squash this into the relevant patch. (ie. "git submodule update: have a dedicated helper for cloning", 23-02-2016). Thanks

Re: [PATCH] run-command: fix an 'different modifiers' sparse warning

2016-02-25 Thread Ramsay Jones
On 25/02/16 21:39, Jeff King wrote: > On Thu, Feb 25, 2016 at 12:20:12PM -0800, Junio C Hamano wrote: > >> Ramsay Jones writes: >> >>> Signed-off-by: Ramsay Jones >>> --- >>> >>> Hi Jeff, >>> >>> If you need to re-roll yo

Re: Compiler warning under cygwin/mingw

2016-02-29 Thread Ramsay Jones
ate may fix it! ;-) [I personally don't use the git daemon on cygwin, so I don't know if this a problem in practice.] ATB, Ramsay Jones -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH v7 29/33] setup: configure ref storage on setup

2016-03-01 Thread Ramsay Jones
quot;refs.h" > #include "string-list.h" > #include "utf8.h" > I was just skimming these patches as they passed by, and this caught my eye. If this include is required (eg. to fix a compiler warning), then it should probably be in an earlier patch. Otherwise, i

Re: [PATCH v7 30/33] refs: break out resolve_ref_unsafe_submodule

2016-03-01 Thread Ramsay Jones
rage_backend(&refs_be_lmdb); > +#endif Again, just skimming patches, ... The lmdb refs backend (hence refs_be_lmdb) is not introduced until the next patch [31/33], right? ATB, Ramsay Jones -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: Compiler warning under cygwin/mingw

2016-03-02 Thread Ramsay Jones
On 29/02/16 12:32, Ramsay Jones wrote: > > > On 29/02/16 10:40, Torsten Bögershausen wrote: >> That compiles OK, thanks. >> >> >> Sorry for high-jacking this thread, but while compiling under CYGWIN, >> found one warning: >> >>LINK git-

Re: Compiler warning under cygwin/mingw

2016-03-02 Thread Ramsay Jones
On 03/03/16 03:33, Ramsay Jones wrote: > > > On 29/02/16 12:32, Ramsay Jones wrote: >> >> >> On 29/02/16 10:40, Torsten Bögershausen wrote: >>> That compiles OK, thanks. >>> >>> >>> Sorry for high-jacking this thread, but while com

Re: git diff does not precompose unicode file paths (OS X)

2016-03-04 Thread Ramsay Jones
f_ui_defaults(); git_config(git_diff_ui_config, NULL); + precompose_argv(argc, argv); init_revisions(&rev, prefix); ATB, Ramsay Jones -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH 0/2] diff: fix a memory leak

2016-03-04 Thread Ramsay Jones
to make sure that you do/don't hit that breakpoint before the return at line #304/305.] Ramsay Jones (2): xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits xdiff/xprepare: fix a memory leak xdiff/xprepare.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.7

[PATCH 1/2] xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits

2016-03-04 Thread Ramsay Jones
to use the macros. However, one example of direct manipulation remains. Update this code to use the XDF_DIFF_ALG() macro. Signed-off-by: Ramsay Jones --- xdiff/xprepare.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c index 63a22c6..5ffcf99 10

[PATCH 2/2] xdiff/xprepare: fix a memory leak

2016-03-04 Thread Ramsay Jones
s(), then this xdlclassifier_t structure, and the memory allocated to it, is not cleaned up. In order to fix the memory leak, insert a call to xdl_free_classifier() before returning. Signed-off-by: Ramsay Jones --- xdiff/xprepare.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xdiff/xprepare.c b/

Re: [PATCH 2/2] xdiff/xprepare: fix a memory leak

2016-03-04 Thread Ramsay Jones
On 04/03/16 23:50, Junio C Hamano wrote: > Ramsay Jones writes: > >> The xdl_prepare_env() function may initialise an xdlclassifier_t >> data structure via xdl_init_classifier(), which allocates memory >> to several fields, for example 'rchash', 'rcrecs

Re: [PATCH] merge: refuse to create too cool a merge by default

2016-03-18 Thread Ramsay Jones
t; git reset --hard E && > test_commit CC2 && > test_tick && > - git merge -s ours CC1 && > + # E is a root commit unrelated to MMR root on which CC1 is based > + git merge -s ours --allow-unrelated-histories CC1 && >

Re: [PATCH v2] Add the tag.gpgsign option to sign all created tags

2016-03-20 Thread Ramsay Jones
> +--no-sign:: > + Countermand `tag.gpgSign` configuration variable that is > + set to force each and every tag to be signed. > + I assume that, after setting tag.gpgsign in the config, this is the only way to get a lightweight tag. Maybe here, or above in config.txt, this could

[PATCH] t6302: fix up expect files for tests 34-36

2016-03-31 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Karthik, If you need to re-roll the patches in your 'kn/ref-filter-branch-list' branch, could you please squash this into the relevant patch (which would be equivalent to commit 86cd4d32, "ref-filter: implement %(if), %(then), and %(else) ato

Re: [PATCHv3 0/2] Fix relative path issues in recursive submodules.

2016-04-01 Thread Ramsay Jones
. > + sm_gitdir = absolute_path(sm_gitdir_rel); > > if (!is_absolute_path(path)) { > - /* > - * TODO: add prefix here once we allow calling from non root > - * directory? > - */ > - strbuf_addf(&sb, "%s/%s&quo

Re: [PATCH 1/2] imap-send.c: implements the GIT_CURL_DEBUG environment variable

2016-04-01 Thread Ramsay Jones
if (getenv("GIT_CURL_VERBOSE")) > + curl_easy_setopt(curl, CURLOPT_VERBOSE, 1); > + > > return curl; > } > I would have expected something like: if (0 < verbosity || getenv("GIT_CURL_VERBOSE")) { curl_easy_setopt(curl, C

Re: [PATCH 2/2] http.c: implements the GIT_CURL_DEBUG environment variable

2016-04-01 Thread Ramsay Jones
_CURL_DEBUG")) curl_easy_setopt(result, CURLOPT_DEBUGFUNCTION, curl_trace); } Although that does make GIT_CURL_DEBUG subordinate to GIT_CURL_VERBOSE. So, that may not be desired ... ATB, Ramsay Jones -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH v3 00/16] port branch.c to use ref-filter's printing options

2016-04-01 Thread Ramsay Jones
reroll? Yes, I sent the same patch to Karthik yesterday. Unfortunately, I didn't send it as a response to this email thread, so it may have been hard to spot on the mailing list. My bad. Sorry for wasting your time. :( ATB, Ramsay Jones > > diff --git a/t/t6302-for-each-ref-fil

[PATCH] builtin/log.c: fixup format-patch --base segfault

2016-04-02 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Xiaolong, When you next re-roll your 'xy/format-patch-base' branch could you please squash this (or something like it) into the relevant patch. (commit 50ff6afd, "format-patch: add '--base' option to record base tree info", 31-03

[PATCH] convert.c: fix some sparse warnings

2016-04-03 Thread Ramsay Jones
Sparse complains thus: SP convert.c convert.c:180:24: warning: Using plain integer as NULL pointer convert.c:241:28: warning: dubious: !x & y Signed-off-by: Ramsay Jones --- Hi Torsten, When you re-roll your 'tb/safe-crlf-output-fix' branch, could you please sq

[PATCH 2/3] index-helper: convert strncpy to memcpy

2016-04-10 Thread Ramsay Jones
see commit eddda371 ("convert strncpy to memcpy", 24-09-2015). Signed-off-by: Ramsay Jones --- index-helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index-helper.c b/index-helper.c index 4a8e2ae..00f286a 100644 --- a/index-helper.c +++ b/index-helper.c

[PATCH 1/3] index-helper: fix UNIX_PATH_MAX redefinition error on cygwin

2016-04-10 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- git-compat-util.h | 17 - index-helper.c| 4 ++-- read-cache.c | 2 +- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/git-compat-util.h b/git-compat-util.h index 0e35c13..c90c8c6 100644 --- a/git-compat-util.h +++ b/git

[PATCH 0/3] index-helper: fix UNIX_PATH_MAX redefinition error on cygwin

2016-04-10 Thread Ramsay Jones
_MAX and simply use sizeof(address.sun_path) instead! The second and third patches are simply 'mild suggestions' for other minor issues I noticed while looking into these warnings. ATB, Ramsay Jones Ramsay Jones (3): index-helper: fix UNIX_PATH_MAX redefinition error on cygwin index-h

[PATCH 3/3] index-helper: take extra care with readlink

2016-04-10 Thread Ramsay Jones
o zero and the contents of the symlink being no more than 'sizeof(address.sun_path) - 1' bytes long. In order to make the call easier to reason about, introduce a wrapper function, read_link(), which copes with overlong symlinks and ensures correct NULL termination. Signed-off-by: Ram

Re: [PATCH 1/3] index-helper: fix UNIX_PATH_MAX redefinition error on cygwin

2016-04-11 Thread Ramsay Jones
On 11/04/16 05:20, Torsten Bögershausen wrote: > On 04/11/2016 12:59 AM, Ramsay Jones wrote: > The header mentions cygwin, but changes it for linux, BSD and Mac OS as well. > Is this intentional ? Yes. I only compile on 32/64-bit linux and 64-bit cygwin these days, so I only no

Re: [PATCH v4 03/16] index-helper: new daemon for caching index and related stuff

2016-04-13 Thread Ramsay Jones
fers! > + */ > +#define UNIX_PATH_MAX 92 > +#endif > + It seems you forgot to delete this hunk. ;-) > #endif ATB, Ramsay Jones -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCHv3 0/2] Fix relative path issues in recursive submodules.

2016-04-13 Thread Ramsay Jones
On 12/04/16 16:58, Stefan Beller wrote: > On Fri, Apr 1, 2016 at 7:41 AM, Ramsay Jones > wrote: >> [snip[ >>> - } >>> + sm_gitdir_rel = strbuf_detach(&sb, NULL); >> >> ... this is good, but ... >> >>> + sm_gitdir = abso

Re: Binary grep t7008 known breakage vanished on Cygwin

2016-04-18 Thread Ramsay Jones
0070-fundamental.sh test #5) now seems to pass with the 'native' regex library] ATB, Ramsay Jones -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: Binary grep t7008 known breakage vanished on Cygwin

2016-04-19 Thread Ramsay Jones
On 19/04/16 09:42, Adam Dinwoodie wrote: > On Mon, Apr 18, 2016 at 06:08:15PM +0100, Ramsay Jones wrote: >> On 18/04/16 16:21, Adam Dinwoodie wrote: >>> t7008.12 is marked as an expected failure, but building Git on Cygwin >>> including a `make configure &&

Re: [PATCH 1/4] http.h: Add debug callback and helper routine for implementing the GIT_TRACE_CURL environment variable in http.c

2016-04-19 Thread Ramsay Jones
On 19/04/16 16:10, Elia Pinto wrote: > Add the debug callback and helper routine prototype used by > curl_easy_setopt CURLOPT_DEBUGFUNCTION in http.c > for implementing the GIT_TRACE_CURL environment variable > > > Helped-by: Torsten Bögershausen > Helped-by: Ramsay Jone

Re: [PATCH 1/4] http.h: Add debug callback and helper routine for implementing the GIT_TRACE_CURL environment variable in http.c

2016-04-19 Thread Ramsay Jones
On 19/04/16 22:48, Ramsay Jones wrote: > [snip] > I think the minimal fixup (including Junio's comment on patch #2, which also > triggered for me) is given in the patch below. BTW, if you want to have a single static instance of the 'struct trace_key', then the follo

Re: [PATCH v2 06/12] wt-status.c: split rebase detection out of wt_status_get_state()

2016-04-20 Thread Ramsay Jones
On 20/04/16 14:24, Nguyễn Thái Ngọc Duy wrote: > worktree.c:find_shared_symref() later needs to know if a branch is being > rebased, and only rebased only. Split this code so it can be used ^ Err ... what? ATB, Ramsay Jones -- To unsubscribe from this list

[PATCH] tag.c: remove extern keyword from function definition

2016-04-20 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Santiago, If you need to re-roll your 'st/verify-tag' branch, could you please squash this into the relevant patch (commit c5213b40, "verify-tag: move tag verification code to tag.c", 19-04-2016). Although not actually an error, it is

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