Re: [PATCH v2 00/10] tag: only respect `pager.tag` in list-mode

2017-07-31 Thread Martin Ågren
On 31 July 2017 at 05:46, Jeff King <p...@peff.net> wrote: > On Sun, Jul 23, 2017 at 08:17:42PM +0200, Martin Ågren wrote: > >> On 21 July 2017 at 00:27, Junio C Hamano <gits...@pobox.com> wrote: >> > I tend to agree with you that 1-3/10 may be better off being a &

Re: [PATCH v2 10/10] git.c: ignore pager.* when launching builtin as dashed external

2017-07-31 Thread Martin Ågren
On 31 July 2017 at 05:45, Jeff King <p...@peff.net> wrote: > On Mon, Jul 17, 2017 at 10:10:52PM +0200, Martin Ågren wrote: > >> One could address this in run_argv(), by making the second call to >> execv_dashed_external() conditional on "!is_builtin()" whereas a b

Re: [PATCH v2 06/10] t7006: add tests for how git tag paginates

2017-07-31 Thread Martin Ågren
On 31 July 2017 at 18:37, Junio C Hamano wrote: > Jeff King writes: > >> But here... >> >>> +test_expect_success TTY 'git tag -a respects pager.tag' ' >>> +test_when_finished "git tag -d newtag" && >>> +rm -f paginated.out && >>> +test_terminal git

[PATCH v3 0/7] tag: only respect `pager.tag` in list-mode

2017-08-02 Thread Martin Ågren
[1] https://public-inbox.org/git/cover.1499723297.git.martin.ag...@gmail.com/T/ [2] https://public-inbox.org/git/cover.1500321657.git.martin.ag...@gmail.com/T/#u Martin Ågren (7): builtin.h: take over documentation from api-builtin.txt git.c: let builtins opt for handling `pager.fo

[PATCH v3 1/7] builtin.h: take over documentation from api-builtin.txt

2017-08-02 Thread Martin Ågren
mentation up to date with the available flags. While at it, correct '3 more things to do' to '4 more things to do'. Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- I'm still documenting SUPPORT_SUPER_PREFIX. As Junio pointed out, a nearby patch series is working on losing it (o

[PATCH v3 2/7] git.c: let builtins opt for handling `pager.foo` themselves

2017-08-02 Thread Martin Ågren
d_external()`. That call site is arguably wrong, although in a way that is not yet visible, and will be changed in a slightly different direction in a later patch. Don't add any users of DELAY_PAGER_CONFIG just yet, one will follow in a later patch. Suggested-by: Jeff King <p...@peff.net> Signe

[PATCH v3 3/7] git.c: provide setup_auto_pager()

2017-08-02 Thread Martin Ågren
ager just yet, one will follow in a later patch. Suggested-by: Jeff King <p...@peff.net> Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- builtin.h | 12 git.c | 10 ++ 2 files changed, 22 insertions(+) diff --git a/builtin.h b/builtin.h index 0f3a7b7

[PATCH v3 4/7] t7006: add tests for how git tag paginates

2017-08-02 Thread Martin Ågren
see whether the pager is used or not. Make one of the tests demonstrate the broken behavior mentioned above, where `git tag -a` respects `pager.tag`. Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- In one place, I now use test_expect_failure (t

[PATCH v3 5/7] tag: respect `pager.tag` in list-mode only

2017-08-02 Thread Martin Ågren
-by: Anatoly Borodin <anatoly.boro...@gmail.com> Suggested-by: Jeff King <p...@peff.net> Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- Documentation/git-tag.txt | 3 +++ t/t7006-pager.sh | 15 ++- builtin/tag.c | 3 +++ git.c

[PATCH v3 6/7] tag: change default of `pager.tag` to "on"

2017-08-02 Thread Martin Ågren
rt users of `git tag -a` as it would have before. Make that change. Update documentation and tests. Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- Documentation/git-tag.txt | 2 +- t/t7006-pager.sh | 28 ++-- builtin/tag.c | 2 +- 3 files cha

[PATCH v3 7/7] git.c: ignore pager.* when launching builtin as dashed external

2017-08-02 Thread Martin Ågren
ias, it doesn't get the chance to do so, as outlined above. That recent patch added a test to document this breakage. Do not check `pager.foo` before launching a builtin as a dashed external, i.e., if we recognize the name of the external as a builtin. Change the test to use `test_expect_success`

Re: [PATCH v3 0/7] tag: only respect `pager.tag` in list-mode

2017-08-03 Thread Martin Ågren
On 3 August 2017 at 21:29, Jeff King <p...@peff.net> wrote: > On Wed, Aug 02, 2017 at 09:40:48PM +0200, Martin Ågren wrote: > >> This is the third version of my attempt to make `pager tag` useful (v1 >> at [1], v2 at [2]). Thanks to Junio and Peff for comments on v2. &

Re: [PATCH v3 1/7] builtin.h: take over documentation from api-builtin.txt

2017-08-03 Thread Martin Ågren
On 3 August 2017 at 19:44, Junio C Hamano <gits...@pobox.com> wrote: > Martin Ågren <martin.ag...@gmail.com> writes: >> + * . Add `builtin/foo.o` to `BUILTIN_OBJS` in `Makefile`. > > Not a new problem but it will become much easier to follow if we > moved this item

Re: tsan: t3008: hashmap_add touches size from multiple threads

2017-08-15 Thread Martin Ågren
On 15 August 2017 at 20:17, Stefan Beller <sbel...@google.com> wrote: > On Tue, Aug 15, 2017 at 10:59 AM, Jeff Hostetler <g...@jeffhostetler.com> > wrote: >> >> >> On 8/15/2017 8:53 AM, Martin Ågren wrote: >>> >>> Using SANITIZE

Re: [PATCH 4/5] strbuf_reset: don't write to slopbuf with ThreadSanitizer

2017-08-15 Thread Martin Ågren
On 15 August 2017 at 20:43, Junio C Hamano <gits...@pobox.com> wrote: > Martin Ågren <martin.ag...@gmail.com> writes: > >> If two threads have one freshly initialized string buffer each and call >> strbuf_reset on them at roughly the same time, both th

Re: tsan: t3008: hashmap_add touches size from multiple threads

2017-08-15 Thread Martin Ågren
On 15 August 2017 at 20:48, Stefan Beller wrote: /* total number of entries (0 means the hashmap is empty) */ - unsigned int size; + /* -1 means size is unknown for threading reasons */ + int size; >>> >>> This double-encodes the

Re: tsan: t5400: set_try_to_free_routine

2017-08-15 Thread Martin Ågren
On 15 August 2017 at 19:35, Stefan Beller <sbel...@google.com> wrote: > On Tue, Aug 15, 2017 at 5:53 AM, Martin Ågren <martin.ag...@gmail.com> wrote: >> Using SANITIZE=thread made t5400-send-pack.sh hit the potential race >> below. >> >> This is set_try

Re: [PATCH 1/5] convert: initialize attr_action in convert_attrs

2017-08-15 Thread Martin Ågren
On 15 August 2017 at 16:17, Torsten Bögershausen <tbo...@web.de> wrote: > On Tue, Aug 15, 2017 at 02:53:01PM +0200, Martin Ågren wrote: >> convert_attrs populates a struct conv_attrs. The field attr_action is >> not set in all code paths, but still one caller unconditional

Re: [PATCH v3 1/2 / RFC] builtin/branch: stop supporting the use of --set-upstream option

2017-08-14 Thread Martin Ågren
On 14 August 2017 at 10:54, Kaartic Sivaraam wrote: > The '--set-upstream' option of branch was deprecated in, > > b347d06bf branch: deprecate --set-upstream and show help if we > detect possible mistaken use (Thu, 30 Aug 2012 19:23:13 +0200) > > It was

Re: [PATCH v4 5/8] interpret-trailers: add --parse convenience option

2017-08-15 Thread Martin Ågren
On 15 August 2017 at 12:23, Jeff King wrote: > SYNOPSIS > > [verse] > -'git interpret-trailers' [--in-place] [--trim-empty] [(--trailer > [(=|:)])...] [...] > +'git interpret-trailers' [options] [(--trailer [(=|:)])...] > [...] > +'git interpret-trailers' [options]

tsan: t5400: set_try_to_free_routine

2017-08-15 Thread Martin Ågren
Using SANITIZE=thread made t5400-send-pack.sh hit the potential race below. This is set_try_to_free_routine in wrapper.c. The race relates to the reading of the "old" value. The caller doesn't care about the "old" value, so this should be harmless right now. But it seems that using this mechanism

tsan: t3008: hashmap_add touches size from multiple threads

2017-08-15 Thread Martin Ågren
Using SANITIZE=thread made t3008-ls-files-lazy-init-name-hash.sh hit the potential race below. What seems to happen is, threaded_lazy_init_name_hash ends up using hashmap_add on the_index.dir_hash from two threads in a way that tsan considers racy. While the buckets each have their own mutex, the

[PATCH 2/5] pack-objects: take lock before accessing `remaining`

2017-08-15 Thread Martin Ågren
y again. We could tweak the contract so that the lock should be taken before calling find_deltas, but let's defer that until someone can actually show that "unlock+lock" has a measurable negative impact. Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- I don't think thi

[PATCH 3/5] Makefile: define GIT_THREAD_SANITIZER

2017-08-15 Thread Martin Ågren
and define GIT_THREAD_SANITIZER when we are compiling for tsan. Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 461c845d3..e77a60d1f 100644 --- a/Makefile +++ b/Makefile @@ -1033,6 +1033,9 @@ BASIC_

[PATCH/RFC 0/5] Some ThreadSanitizer-results

2017-08-15 Thread Martin Ågren
of little to no (or even negative) value... I'll follow up with the two remaining issues that I found but which I do not try to address in this series. Martin Martin Ågren (5): convert: initialize attr_action in convert_attrs pack-objects: take lock before accessing `remaining` Makefi

[PATCH 1/5] convert: initialize attr_action in convert_attrs

2017-08-15 Thread Martin Ågren
that first assignment while we're here. Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- I hit a warning about attr_action possibly being uninitialized when building with SANITIZE=thread. I guess it's some random interaction between code added by tsan, the optimizer (-O3) and the w

[PATCH 5/5] ThreadSanitizer: add suppressions

2017-08-15 Thread Martin Ågren
quot; might not work. Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- I am no memory-model expert. Maybe (aligned) stores and loads of int are not actually atomic on all the various hardware that Git wants to run on. Or maybe the compiler is allowed to compile them into 4 1-byte

[PATCH 4/5] strbuf_reset: don't write to slopbuf with ThreadSanitizer

2017-08-15 Thread Martin Ågren
n more bad if we stop covering it up in strbuf_reset.) Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- strbuf.h | 12 1 file changed, 12 insertions(+) diff --git a/strbuf.h b/strbuf.h index e705b94db..295654d39 100644 --- a/strbuf.h +++ b/strbuf.h @@ -153,7 +153,19 @@ st

Re: [PATCH 3/9] Convert unpack-objects to size_t

2017-08-12 Thread Martin Ågren
On 12 August 2017 at 10:47, Martin Koegler wrote: > From: Martin Koegler > > Signed-off-by: Martin Koegler > --- > builtin/unpack-objects.c | 20 ++-- > 1 file changed, 10 insertions(+), 10

Re: [PATCH 5/9] Convert various things to size_t

2017-08-12 Thread Martin Ågren
On 12 August 2017 at 10:47, Martin Koegler wrote: > From: Martin Koegler > > --- > bisect.c| 2 +- > blame.c | 2 +- > builtin/fmt-merge-msg.c | 2 +- > builtin/mktag.c | 2 +- > dir.c

Re: [PATCH 0/7] tag: more fine-grained pager-configuration

2017-07-12 Thread Martin Ågren
On 11 July 2017 at 00:42, Junio C Hamano <gits...@pobox.com> wrote: > Martin Ågren <martin.ag...@gmail.com> writes: >> I am not moving all builtins to handling the pager on their own, >> but instead introduce a flag IGNORE_PAGER_CONFIG and use it only >> with th

[PATCH v2 00/10] tag: only respect `pager.tag` in list-mode

2017-07-17 Thread Martin Ågren
pect_failure` which this patch then fixes. Martin [1] https://public-inbox.org/git/cover.1499723297.git.martin.ag...@gmail.com/T/ Martin Ågren (10): builtin.h: take over documentation from api-builtin.txt builtin.h: format documentation-comment properly builtin.h: document SUPPORT_SUPER_PR

[PATCH v2 02/10] builtin.h: format documentation-comment properly

2017-07-17 Thread Martin Ågren
The previous commit moved technical documentation verbatim into builtin.h. Prefix all the lines with '*' to follow the coding guidelines. Remove a '+' which was needed when the information was formatted for AsciiDoc. Similarly, change "::" to ":". Signed-off-by: Mar

[PATCH v2 04/10] git.c: let builtins opt for handling `pager.foo` themselves

2017-07-17 Thread Martin Ågren
gested-by: Jeff King <p...@peff.net> Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- builtin.h | 8 git.c | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/builtin.h b/builtin.h index 7bcc08456..4186635de 100644 --- a/builtin.h

[PATCH v2 01/10] builtin.h: take over documentation from api-builtin.txt

2017-07-17 Thread Martin Ågren
. Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- Documentation/technical/api-builtin.txt | 73 --- builtin.h | 76 + 2 files changed, 76 insertions(+), 73 deletions(-) delete mode 100644 Documen

[PATCH v2 03/10] builtin.h: document SUPPORT_SUPER_PREFIX

2017-07-17 Thread Martin Ågren
gs. While at it, correct '3 more things to do' to '4 more things to do'. Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- builtin.h | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/builtin.h b/builtin.h index 62f22b547..7bcc08456 100644 --- a/builtin.h +++ b/builtin.h

[PATCH v2 05/10] git.c: provide setup_auto_pager()

2017-07-17 Thread Martin Ågren
ager just yet, one will follow in a later patch. Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- builtin.h | 9 + git.c | 10 ++ 2 files changed, 19 insertions(+) diff --git a/builtin.h b/builtin.h index 4186635de..3ca4a53a8 100644 --- a/builtin.h +++ b/b

[PATCH v2 10/10] git.c: ignore pager.* when launching builtin as dashed external

2017-07-17 Thread Martin Ågren
ias, it doesn't get the chance to do so, as outlined above. That recent patch added a test to document this breakage. Do not check `pager.foo` before launching a builtin as a dashed external, i.e., if we recognize the name of the external as a builtin. Change the test to use `test_expect_success`

[PATCH v2 08/10] tag: respect `pager.tag` in list-mode only

2017-07-17 Thread Martin Ågren
this known breakage. It will be fixed in a later commit. Add a similar test for `-l`, which works as it should. Noticed-by: Anatoly Borodin <anatoly.boro...@gmail.com> Suggested-by: Jeff King <p...@peff.net> Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- Documentation/

[PATCH v2 06/10] t7006: add tests for how git tag paginates

2017-07-17 Thread Martin Ågren
, where `git tag -a` respects `pager.tag`. Actually, the tests use `git tag -am` so no editor is launched, but that is irrelevant, since we just want to see whether the pager is used or not. Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- t/t7006-pager.sh | 68 ++

[PATCH v2 07/10] tag: handle `pager.tag`-configuration within the builtin

2017-07-17 Thread Martin Ågren
ous usages. Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- builtin/tag.c | 2 ++ git.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/builtin/tag.c b/builtin/tag.c index 01154ea8d..9eda434fb 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -461

[PATCH v2 09/10] tag: change default of `pager.tag` to "on"

2017-07-17 Thread Martin Ågren
rt users of `git tag -a` as it would have before. Make that change. Update documentation and tests. Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- Documentation/git-tag.txt | 2 +- t/t7006-pager.sh | 28 ++-- builtin/tag.c | 2 +- 3 files cha

Re: [PATCH] use DIV_ROUND_UP

2017-07-09 Thread Martin Ågren
On 8 July 2017 at 12:35, René Scharfe wrote: > Convert code that divides and rounds up to use DIV_ROUND_UP to make the > intent clearer and reduce the number of magic constants. ... > diff --git a/sha1_name.c b/sha1_name.c > index e7f7b12ceb..8c513dbff6 100644 > --- a/sha1_name.c >

Re: [PATCH] use DIV_ROUND_UP

2017-07-09 Thread Martin Ågren
On 9 July 2017 at 16:01, René Scharfe <l@web.de> wrote: > Am 09.07.2017 um 15:25 schrieb Martin Ågren: >> On 8 July 2017 at 12:35, René Scharfe <l@web.de> wrote: >>> Convert code that divides and rounds up to use DIV_ROUND_UP to make the >>> intent

Re: [PATCH 6/7] tag: make git tag -l consider new config `pager.tag.list`

2017-07-11 Thread Martin Ågren
On 11 July 2017 at 12:41, Jeff King <p...@peff.net> wrote: > On Mon, Jul 10, 2017 at 11:55:19PM +0200, Martin Ågren wrote: > >> diff --git a/builtin/tag.c b/builtin/tag.c >> index e0f129872..e96ef7d70 100644 >> --- a/builtin/tag.c >> +++ b/builtin/tag.c >>

Re: [PATCH 2/7] git.c: let builtins opt for handling `pager.foo` themselves

2017-07-11 Thread Martin Ågren
On 11 July 2017 at 12:24, Jeff King <p...@peff.net> wrote: > On Mon, Jul 10, 2017 at 11:55:15PM +0200, Martin Ågren wrote: > >> To allow individual builtins to make more informed decisions about when >> to respect `pager.foo`, introduce a flag IGNORE_PAGER_CONFIG. I

Re: [PATCH 0/7] tag: more fine-grained pager-configuration

2017-07-11 Thread Martin Ågren
On 11 July 2017 at 12:19, Jeff King <p...@peff.net> wrote: > On Mon, Jul 10, 2017 at 11:55:13PM +0200, Martin Ågren wrote: > >> Using, e.g., `git -c pager.tag tag -a new-tag` results in errors such >> as "Vim: Warning: Output is not to a terminal" and a garbled

Re: [PATCH 3/7] git.c: provide setup_auto_pager()

2017-07-11 Thread Martin Ågren
On 11 July 2017 at 12:37, Jeff King <p...@peff.net> wrote: > On Mon, Jul 10, 2017 at 11:55:16PM +0200, Martin Ågren wrote: > >> +void setup_auto_pager(const char *cmd, int def) >> +{ >> + if (use_pager != -1) >> + return; > > I think y

[PATCH 0/7] tag: more fine-grained pager-configuration

2017-07-10 Thread Martin Ågren
hat's definitely outside this series, but should not be prohibited by it... A review would be much appreciated. Comments on the way I structured the series would be just as welcome as ones on the final result. Martin [1] https://public-inbox.org/git/nrmbrl$hsk$1...@blaine.gmane.org/T/ Martin Ågren (7)

[PATCH 7/7] tag: make git tag -l use pager by default

2017-07-10 Thread Martin Ågren
The previous patch introduced `pager.tag.list`. Its default was to use the value of `pager.tag` or, if that was also not set, to fall back to "off". Change that fallback value to "on". Let the default value for `pager.tag` remain at "off". Update documentation and

[PATCH 6/7] tag: make git tag -l consider new config `pager.tag.list`

2017-07-10 Thread Martin Ågren
n tree which carefully ensures that setup_auto_pager() is called precisely once. A greedy approach such as the one taken here works just fine. Noticed-by: Anatoly Borodin <anatoly.boro...@gmail.com> Suggested-by: Jeff King <p...@peff.net> Signed-off-by: Martin Ågren <martin.ag...@g

[PATCH 5/7] tag: handle `pager.tag`-configuration within the builtin

2017-07-10 Thread Martin Ågren
erroneous usages. Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- builtin/tag.c | 2 ++ git.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/builtin/tag.c b/builtin/tag.c index 01154ea8d..e0f129872 100644 --- a/builtin/tag.c +++ b/builtin/tag.c

[PATCH 2/7] git.c: let builtins opt for handling `pager.foo` themselves

2017-07-10 Thread Martin Ågren
applies to two code-paths -- one in run_builtin() and one in execv_dashed_external(). Document the flag in api-builtin.txt. Don't add any users of IGNORE_PAGER_CONFIG just yet, one will follow in a later patch. Suggested-by: Jeff King <p...@peff.net> Signed-off-by: Martin Ågr

[PATCH 4/7] t7006: add tests for how git tag paginates

2017-07-10 Thread Martin Ågren
ich case no editor is launched, but that is irrelevant, since we just want to see whether the pager is used or not. (If `git tag -am` ever learns to avoid the pager, these tests will need to be updated and two of them will fail.) Signed-off-by: Martin Ågren <martin.ag...@gmai

[PATCH 3/7] git.c: provide setup_auto_pager()

2017-07-10 Thread Martin Ågren
we split at the first or last '.', so it seems just as easy, and certainly more flexible, to handle the more general situation. Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- builtin.h | 14 ++ git.c | 28 2 files changed, 42 ins

[PATCH 1/7] api-builtin.txt: document SUPPORT_SUPER_PREFIX

2017-07-10 Thread Martin Ågren
able flags. Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- Documentation/technical/api-builtin.txt | 4 1 file changed, 4 insertions(+) diff --git a/Documentation/technical/api-builtin.txt b/Documentation/technical/api-builtin.txt index 22a39b929..60f442822 100644 ---

Re: [PATCH 1/7] api-builtin.txt: document SUPPORT_SUPER_PREFIX

2017-07-11 Thread Martin Ågren
On 11 July 2017 at 00:50, Brandon Williams <bmw...@google.com> wrote: > On 07/10, Martin Ågren wrote: >> Commit 74866d75 ("git: make super-prefix option", 2016-10-07) introduced >> SUPPORT_SUPER_PREFIX as a builtin flag without documenting it in >> api-builtin

Re: --interactive mode: readline support ⌨⬆

2017-07-20 Thread Martin Ågren
On 20 July 2017 at 10:21, Marcel Partap wrote: > wouldn't it be great to have the power of readline added to the power of git > interactive commands? Yes, rlwrap will do the job, but still. > Or am I missing something obvious? Well maybe *I* am missing something obvious. :)

Re: --interactive mode: readline support ⌨⬆

2017-07-20 Thread Martin Ågren
On 20 July 2017 at 11:20, Marcel Partap wrote: > So the readline library powers the advanced line editing capabilities behind > f.e. the bash or the ipython shell. Besides navigating with the cursor keys, > it provides a history function accessible by the up cursor key ⌨⬆ . >

Re: fatal: bad numeric config value '60 days' for 'gc.rerereresolved': invalid unit

2017-07-21 Thread Martin Ågren
On 21 July 2017 at 14:59, Uwe Hausbrand wrote: > git config gc.rerereresolved "60 days" > git gc > > results in: [...] > fatal: bad numeric config value '60 days' for 'gc.rerereresolved': invalid > unit > error: failed to run rerere It's not entirely clear, but "man

Re: [PATCH v2 00/10] tag: only respect `pager.tag` in list-mode

2017-07-23 Thread Martin Ågren
On 21 July 2017 at 00:27, Junio C Hamano wrote: > I tend to agree with you that 1-3/10 may be better off being a > single patch (or 3/10 dropped, as Brandon is working on losing it > nearby). I would have expected 7-8/10 to be a single patch, as by > the time a reader reaches

[PATCH] make get_be64() compile on pu with NO_UNALIGNED_LOADS

2017-07-22 Thread Martin Ågren
1. s/unit64_t/uint64_t/ 2. add const-qualifier to *p 3. add missing closing ')' Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- Applies to pu and passes the tests. I think this should be squashed in somewhere. Perhaps a mismerge in commit d553324d ("Merge branch 'bp/fsmonit

Re: Bug Report - Segmentation Fault on "git add --all"

2017-07-19 Thread Martin Ågren
On 20 July 2017 at 02:54, Tillson Galloway wrote: > Context: > We currently have a git project with a root directory ("~/project") > for pipelines and deployment of a Node app, and then a subdirectory > ("~/project/project-app"). > After realizing that we didn't need

Re: [PATCH 0/6] clean up parsing of maybe_bool

2017-08-07 Thread Martin Ågren
On 7 August 2017 at 23:12, Junio C Hamano wrote: > Stefan Beller writes: > >> The series looks fine to me overall, though patch 5 is overly gentle IMHO. >> We could have removed it right there as Junio is very good at resolving >> conflicts or producing

Re: [PATCH v2 1/2 / RFC] builtin/branch: stop supporting the use of --set-upstream option

2017-08-08 Thread Martin Ågren
On 8 August 2017 at 19:11, Kaartic Sivaraam wrote: > The '--set-upstream' option of branch was deprecated in, > > b347d06bf branch: deprecate --set-upstream and show help if we > detect possible mistaken use (Thu, 30 Aug 2012 19:23:13 +0200) > > It was

Re: [PATCH 0/6] clean up parsing of maybe_bool

2017-08-08 Thread Martin Ågren
On 8 August 2017 at 19:04, Junio C Hamano <gits...@pobox.com> wrote: > Martin Ågren <martin.ag...@gmail.com> writes: > >> Thanks, both of you. I could wait a couple of days to see if there are >> other things to address, then send a v2 with a more aggressive p

Re: [PATCHv2 3/4] imap_send: setup_curl: retreive credentials if not set in config file

2017-08-08 Thread Martin Ågren
On 8 August 2017 at 09:48, Nicolas Morey-Chaisemartin wrote: > Up to this point, the curl mode only supported getting the username > and password from the gitconfig file while the legacy mode could also > fetch them using the credential API. > > Signed-off-by:

[PATCH 1/6] Doc/git-{push,send-pack}: correct --sign= to --signed=

2017-08-07 Thread Martin Ågren
s://public-inbox.org/git/1439998007-28719-1-git-send-email-dborow...@google.com/T/#m6533a6c4707a30b0d81e86169ff8559460cbf6eb Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- Documentation/git-push.txt | 4 ++-- Documentation/git-send-pack.txt | 4 ++-- 2 files changed, 4

[PATCH 3/6] config: introduce git_parse_maybe_bool_text

2017-08-07 Thread Martin Ågren
y renaming git_parse_maybe_bool to ..._text and reimplementing the first one as a simple call to the second one. Let the existing users in config.c use ..._text, since it does what they need. [1] https://public-inbox.org/git/xmqq7fotd71o@gitster.dls.corp.google.com/ Signed-off-by: Martin Ågren <martin.ag

[PATCH 0/6] clean up parsing of maybe_bool

2017-08-07 Thread Martin Ågren
and diff.colormoved consistent with other booleans. That should be a good thing, but cc Stefan to be sure. Martin [1] https://public-inbox.org/git/xmqq7fotd71o@gitster.dls.corp.google.com/ Martin Ågren (6): Doc/git-{push,send-pack}: correct --sign= to --signed= t5334: document that git push --si

[PATCH 4/6] config: make git_{config,parse}_maybe_bool equivalent

2017-08-07 Thread Martin Ågren
quot;config" into "parse" and make the latter a trivial wrapper. This also fixes the only user of git_parse_maybe_bool, `git push --signed=..`. [1] https://public-inbox.org/git/xmqq7fotd71o....@gitster.dls.corp.google.com/ Signed-off-by: Martin Ågren <martin.ag...@gmail.com>

[PATCH 5/6] treewide: deprecate git_config_maybe_bool, use git_parse_maybe_bool

2017-08-07 Thread Martin Ågren
it as deprecated in the technical documentation. While at it, document git_parse_maybe_bool. Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- Documentation/technical/api-config.txt | 4 builtin/log.c | 4 ++-- builtin/merge.c

[PATCH 2/6] t5334: document that git push --signed=1 does not work

2017-08-07 Thread Martin Ågren
. The --signed option has a different notion of boolean than all other arguments and config options, including the config option corresponding to it, push.gpgSign. Add a test documenting the failure to handle --signed=1. Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- t/t5534-push-signed.

[PATCH 6/6] parse_decoration_style: drop unused argument `var`

2017-08-07 Thread Martin Ågren
The previous commit left it unused. Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- builtin/log.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index 9182f0ee3..483d15a94 100644 --- a/builtin/log.c +++ b/builtin/log.c @@

Re: [PATCH v3 1/7] builtin.h: take over documentation from api-builtin.txt

2017-08-04 Thread Martin Ågren
On 4 August 2017 at 18:00, Junio C Hamano <gits...@pobox.com> wrote: > Martin Ågren <martin.ag...@gmail.com> writes: > >> Since this is my first code contribution to Git, I'll ask about this part of >> SubmittingPatches: >> >> "After the list reac

Re: [PATCH 4/4] imap-send: use curl by default

2017-08-07 Thread Martin Ågren
On 7 August 2017 at 16:04, Nicolas Morey-Chaisemartin wrote: > Signed-off-by: Nicolas Morey-Chaisemartin > --- > imap-send.c | 6 -- > 1 file changed, 6 deletions(-) > > diff --git a/imap-send.c b/imap-send.c > index

Re: [PATCH 3/4] imap_send: setup_curl: use server_conf parameter instead of the global variable

2017-08-07 Thread Martin Ågren
On 7 August 2017 at 16:04, Nicolas Morey-Chaisemartin wrote: > Signed-off-by: Nicolas Morey-Chaisemartin > --- > imap-send.c | 24 > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git

Re: [PATCH 1/4] imap-send: add wrapper to get server credentials if needed

2017-08-07 Thread Martin Ågren
On 7 August 2017 at 16:03, Nicolas Morey-Chaisemartin wrote: > Signed-off-by: Nicolas Morey-Chaisemartin > --- > imap-send.c | 38 -- > 1 file changed, 24 insertions(+), 14 deletions(-) > > diff

Re: [PATCH 1/4] imap-send: add wrapper to get server credentials if needed

2017-08-07 Thread Martin Ågren
On 7 August 2017 at 19:04, Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> wrote: > > > Le 07/08/2017 à 18:30, Martin Ågren a écrit : >> On 7 August 2017 at 16:03, Nicolas Morey-Chaisemartin >> <nico...@morey-chaisemartin.com> wrote: >>> Signe

Re: [PATCH 4/4] imap-send: use curl by default

2017-08-07 Thread Martin Ågren
On 7 August 2017 at 19:10, Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> wrote: > > > Le 07/08/2017 à 18:37, Martin Ågren a écrit : >> On 7 August 2017 at 16:04, Nicolas Morey-Chaisemartin >> <nico...@morey-chaisemartin.com> wrote: >>> Signe

Re: [PATCH v4 2/3] builtin/branch: stop supporting the use of --set-upstream option

2017-08-18 Thread Martin Ågren
On 18 August 2017 at 18:30, Junio C Hamano <gits...@pobox.com> wrote: > Kaartic Sivaraam <kaarticsivaraam91...@gmail.com> writes: > >> On Friday 18 August 2017 01:25 AM, Junio C Hamano wrote: >>> Martin Ågren <martin.ag...@gmail.com> writes: >>> &

Re: [PATCH v4 2/3] builtin/branch: stop supporting the use of --set-upstream option

2017-08-17 Thread Martin Ågren
On 17 August 2017 at 04:54, Kaartic Sivaraam <kaarticsivaraam91...@gmail.com> wrote: > Helped-by: Martin Ågren <martin.ag...@gmail.com>, Junio C Hamano > <gits...@pobox.com> > Signed-off-by: Kaartic Sivaraam <kaarticsivaraam91...@gmail.com> I didn't expect a &

Re: [PATCH 2/2] *.[ch] refactoring: make use of the freez() wrapper

2017-06-09 Thread Martin Ågren
On 9 June 2017 at 10:53, Ævar Arnfjörð Bjarmason wrote: > Replace occurrences of `free(p); p = NULL` with `freez(p)`. This > introduces no functional changes, but cuts the number of lines spent > on this cleanup in half. It's even better than that. ;) > 48 files changed, 97

Re: Unaligned accesses in sha1dc

2017-06-02 Thread Martin Ågren
On 2 June 2017 at 10:51, Ævar Arnfjörð Bjarmason <ava...@gmail.com> wrote: > On Fri, Jun 2, 2017 at 2:15 AM, Junio C Hamano <gits...@pobox.com> wrote: >> Martin Ågren <martin.ag...@gmail.com> writes: >> >>> I looked into this some more. It turns out it is

Re: Unaligned accesses in sha1dc

2017-06-02 Thread Martin Ågren
On 2 June 2017 at 21:32, Ævar Arnfjörð Bjarmason <ava...@gmail.com> wrote: > On Fri, Jun 2, 2017 at 11:49 AM, Martin Ågren <martin.ag...@gmail.com> wrote: >> On 2 June 2017 at 10:51, Ævar Arnfjörð Bjarmason <ava...@gmail.com> wrote: >>> On Fri, Jun 2, 2

Re: Unaligned accesses in sha1dc

2017-06-01 Thread Martin Ågren
On 1 June 2017 at 13:53, Martin Ågren <martin.ag...@gmail.com> wrote: > On 1 June 2017 at 12:33, Ævar Arnfjörð Bjarmason <ava...@gmail.com> wrote: >> On Thu, Jun 1, 2017 at 12:26 PM, Martin Ågren <martin.ag...@gmail.com> wrote: >>> On 1 June 2017 at 12:08, A

Re: Unaligned accesses in sha1dc

2017-06-01 Thread Martin Ågren
On 1 June 2017 at 12:08, Andreas Schwab wrote: > On Jun 01 2017, Junio C Hamano wrote: > >> Depending on the model of "ARM" (or "SPARC") emulated with QEMU, and >> depending on the OS that runs on such an "ARM" or "SPARC", we may >> not see this---if the

Re: Unaligned accesses in sha1dc

2017-06-01 Thread Martin Ågren
On 1 June 2017 at 12:33, Ævar Arnfjörð Bjarmason <ava...@gmail.com> wrote: > On Thu, Jun 1, 2017 at 12:26 PM, Martin Ågren <martin.ag...@gmail.com> wrote: >> On 1 June 2017 at 12:08, Andreas Schwab <sch...@suse.de> wrote: >>> Even if the architecture imple

Re: [PATCH v7 05/12] fsmonitor: add documentation for the fsmonitor extension.

2017-09-20 Thread Martin Ågren
On 19 September 2017 at 21:27, Ben Peart wrote: > diff --git a/Documentation/git-update-index.txt > b/Documentation/git-update-index.txt > index e19eba62cd..95231dbfcb 100644 > --- a/Documentation/git-update-index.txt > +++ b/Documentation/git-update-index.txt > @@ -16,9

[PATCH v2 0/6] reroll ma/plugleaks; more `object_array`-fixes

2017-09-22 Thread Martin Ågren
On 20 September 2017 at 22:02, Jeff King <p...@peff.net> wrote: > On Wed, Sep 20, 2017 at 09:47:24PM +0200, Martin Ågren wrote: > >> Instead of conditionally freeing `rev.pending.objects`, just call >> `object_array_clear()` on `rev.pending`. This means

[PATCH v2 2/6] commit: fix memory leak in `reduce_heads()`

2017-09-22 Thread Martin Ågren
We don't free the temporary scratch space we use with `remove_redundant()`. Free it similar to how we do it in `get_merge_bases_many_0()`. Signed-off-by: Martin Ågren <martin.ag...@gmail.com> Reviewed-by: Jeff King <p...@peff.net> Signed-off-by: Junio C Hamano <gits...@pobox.com

Re: [PATCH 1/4] git-merge: Honor pre-merge hook

2017-09-22 Thread Martin Ågren
On 22 September 2017 at 14:04, Michael J Gruber wrote: > From: Michael J Gruber > > git-merge does not honor the pre-commit hook when doing automatic merge > commits, and for compatibility reasons this is going to stay. > > Introduce a pre-merge hook

Re: [PATCH v2 0/6] reroll ma/plugleaks; more `object_array`-fixes

2017-09-23 Thread Martin Ågren
On 23 September 2017 at 06:37, Jeff King <p...@peff.net> wrote: > On Sat, Sep 23, 2017 at 01:34:48AM +0200, Martin Ågren wrote: > >> Martin Ågren (6): >> builtin/commit: fix memory leak in `prepare_index()` >> commit: fix memory leak in `reduce_h

Re: [PATCH v2 5/6] object_array: add and use `object_array_pop()`

2017-09-23 Thread Martin Ågren
On 23 September 2017 at 06:27, Jeff King <p...@peff.net> wrote: > On Sat, Sep 23, 2017 at 01:34:53AM +0200, Martin Ågren wrote: > >> Introduce and use `object_array_pop()` instead. Release memory in the >> new function. Document that popping an object leaves the associa

Re: [PATCH v2 4/6] object_array: use `object_array_clear()`, not `free()`

2017-09-23 Thread Martin Ågren
On 23 September 2017 at 06:04, Jeff King <p...@peff.net> wrote: > On Sat, Sep 23, 2017 at 01:34:52AM +0200, Martin Ågren wrote: > >> The way we handle `study` in builting/reflog.c still looks like it might >> leak. That will be addressed in the next commit. > > This c

Re: [PATCH v8 08/12] fsmonitor: add a test tool to dump the index extension

2017-09-22 Thread Martin Ågren
On 22 September 2017 at 18:35, Ben Peart wrote: > Add a test utility (test-dump-fsmonitor) that will dump the fsmonitor > index extension. > > Signed-off-by: Ben Peart > --- > Makefile | 1 + > t/helper/test-dump-fsmonitor.c

Re: [PATCH v8 01/12] bswap: add 64 bit endianness helper get_be64

2017-09-22 Thread Martin Ågren
On 22 September 2017 at 18:35, Ben Peart wrote: > Add a new get_be64 macro to enable 64 bit endian conversions on memory > that may or may not be aligned. I needed this to compile and pass the tests with NO_UNALIGNED_LOADS. Martin diff --git a/compat/bswap.h

[PATCH v2 5/6] object_array: add and use `object_array_pop()`

2017-09-22 Thread Martin Ågren
)`. That is unfortunate. On the other hand, it matches `object_array_clear()`. Arguably it's `add_...` that is the odd one out, since it reads like it's used to "add" an "object array". For that reason, side with `object_array_clear()`. Signed-off-by: Martin Ågren <martin.ag

[PATCH v2 4/6] object_array: use `object_array_clear()`, not `free()`

2017-09-22 Thread Martin Ågren
` in builting/reflog.c still looks like it might leak. That will be addressed in the next commit. Signed-off-by: Martin Ågren <martin.ag...@gmail.com> --- builtin/reflog.c | 4 ++-- diff-lib.c | 3 +-- submodule.c | 4 ++-- upload-pack.c| 2 +- 4 files changed, 6 insertions

[PATCH v2 1/6] builtin/commit: fix memory leak in `prepare_index()`

2017-09-22 Thread Martin Ågren
ase it. That introduces some unnecessary overhead in various code paths, but means there is one and only one way out of the function. If we ever accumulate more things we need to free, it should be straightforward to do so. Signed-off-by: Martin Ågren <martin.ag...@gmail.com> Reviewed-by: Jef

  1   2   3   4   5   6   >