Re: [PATCH] rebase docs: fix incorrect format of the section Behavioral Differences

2018-12-03 Thread Martin Ågren
On Mon, 3 Dec 2018 at 18:35, Johannes Sixt wrote: > I actually did not test the result, because I don't have the > infrastructure. I've tested with asciidoc and Asciidoctor, html and man-page. Looks good. Martin

Re: [PATCH v3] range-diff: always pass at least minimal diff options

2018-12-03 Thread Martin Ågren
On Mon, 3 Dec 2018 at 22:21, Eric Sunshine wrote: > [es: retain diff coloring when going to stdout] > > Signed-off-by: Martin Ågren > Signed-off-by: Eric Sunshine > --- > > This is a re-roll of Martin's v2[1]. The only difference from v2 is that > it retains

[PATCH v2 1/3] RelNotes 2.20: move some items between sections

2018-12-03 Thread Martin Ågren
Some items that should be in "Performance, Internal Implementation, Development Support etc." have ended up in "UI, Workflows & Features". Move them, and do s/uses/use/ while at it. Signed-off-by: Martin Ågren --- Documentation/RelNotes/2.20.0.txt | 10 +- 1 fi

Re: [PATCH 1/3] RelNotes 2.20: move some items between sections

2018-12-03 Thread Martin Ågren
On Tue, 4 Dec 2018 at 03:23, Junio C Hamano wrote: > > Martin Ågren writes: > > > Some items that should be in "Performance, Internal Implementation, > > Development Support etc." have ended up in "UI, Workflows & Features" > > and "Fixes

[PATCH v2 3/3] RelNotes 2.20: drop spurious double quote

2018-12-03 Thread Martin Ågren
We have three double-quote characters, which is one too many or too few. Dropping the last one seems to match the original intention best. Signed-off-by: Martin Ågren --- Documentation/RelNotes/2.20.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/RelNotes

[PATCH v2 2/3] RelNotes 2.20: clarify sentence

2018-12-03 Thread Martin Ågren
I had to read this sentence a few times to understand it. Let's try to clarify it. Signed-off-by: Martin Ågren --- Documentation/RelNotes/2.20.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/RelNotes/2.20.0.txt b/Documentation/RelNotes/2.20.0.txt

Re: enhancement: support for author.email and author.name in "git config"

2018-12-06 Thread Martin Ågren
Hi William, On Thu, 6 Dec 2018 at 19:18, William Hubbs wrote: > We are in a situation where we would like to use author information that is > different from committer information when we commit to certain > repositories. [...] > [...] I would like to propose the addition of author.email and > a

Re: [PATCH] diff: allow --recurse-submodules as an synonym for --submodule

2018-09-05 Thread Martin Ågren
On Thu, 6 Sep 2018 at 00:59, Stefan Beller wrote: > > --submodule[=]:: Maybe drop `--submodule` here ... > +--recurse-submodules[=]:: > Specify how differences in submodules are shown. When specifying > `--submodule=short` the 'short' format is used. This format just ... and

Re: [PATCH 2/2] submodule.c: warn about missing submodule commit in recursive actions

2018-09-05 Thread Martin Ågren
> + if (repo_submodule_init(&subrepo, the_repository, path) < 0) > + warning(_("Could not get submodule repository for submodule > 's'"), path); Missing "%" in format specifier, so `path` will never be used. Also, s/C/c/ at the start of the warning. Thanks for marking with _(

Re: [PATCH v3 2/4] eoie: add End of Index Entry (EOIE) extension

2018-09-07 Thread Martin Ågren
On Fri, 7 Sep 2018 at 22:24, Ben Peart wrote: > > Ben Peart writes: > >> - 160-bit SHA-1 over the extension types and their sizes (but not > >> their contents). E.g. if we have "TREE" extension that is N-bytes > >> long, "REUC" extension that is M-bytes long, followed by "EOIE", > >> then the h

Re: [PATCH v3 2/4] eoie: add End of Index Entry (EOIE) extension

2018-09-08 Thread Martin Ågren
On Sat, 8 Sep 2018 at 16:04, Ben Peart wrote: > On 9/8/2018 2:29 AM, Martin Ågren wrote: > > Maybe it all works out, e.g., so that when someone (brian) merges a > > NewHash and runs the testsuite, this will fail consistently and in a > > safe way. But I wonder if it would be

Re: git silently ignores include directive with single quotes

2018-09-08 Thread Martin Ågren
Hi Stas On Sat, 8 Sep 2018 at 21:00, Stas Bekman wrote: > [include] > path = '../.gitconfig' > > Notice the single quotes around the filename. When this is the case git > silently (!) ignores the custom configuration, which is clearly a bug. Thanks for reporting and describing out your e

[PATCH 0/4] git-commit-graph.txt: various cleanups

2018-09-19 Thread Martin Ågren
nups to be made in other parts of git.git. If the dash should actually be there, I could do these changes in the other direction. Or maybe dash-vs-no-dash is not an actual problem at all... Martin Martin Ågren (4): git-commit-graph.txt: fix bullet lists git-commit-graph.txt: typeset more in

[PATCH 1/4] git-commit-graph.txt: fix bullet lists

2018-09-19 Thread Martin Ågren
We have a couple of bullet items which span multiple lines, and where we have prefixed each line with a `*`. (This might be the result of a text editor trying to help.) This results in each line being typeset as a separate bullet item. Drop the extra `*`. Signed-off-by: Martin Ågren

[PATCH 2/4] git-commit-graph.txt: typeset more in monospace

2018-09-19 Thread Martin Ågren
While we're here, fix an instance of "folder" to be "directory". Signed-off-by: Martin Ågren --- Documentation/git-commit-graph.txt | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Documentation/git-commit-graph.txt b/Documentation/g

[PATCH 4/4] git-commit-graph.txt: refer to the "commit graph file" without dash

2018-09-19 Thread Martin Ågren
The command is `git commit-graph`, but the file it processes is the "commit graph file" without a dash. We have a few references to the "commit-graph file", though. Fix them. Signed-off-by: Martin Ågren --- Documentation/git-commit-graph.txt | 6 +++--- 1 file changed

[PATCH 3/4] git-commit-graph.txt: refer to "*commit* graph file"

2018-09-19 Thread Martin Ågren
graph files. Let's just write out the full name everywhere. The full name, by the way, is not the "commit-graph file" with a dash, cf. the synopsis. Use the dashless form. (The next commit will fix the remaining few instances of the "commit-graph file" in this document.) Si

[PATCH 1/2] Doc: use `--type=bool` instead of `--bool`

2018-09-19 Thread Martin Ågren
dy seem to be gone except for in that list of historical options. Tweak the grammar a little in config.txt while we are there. Signed-off-by: Martin Ågren --- Documentation/config.txt | 2 +- Documentation/git-config.txt | 4 ++-- Documentation/git.txt| 2 +- 3 files changed, 4

[PATCH 2/2] git-config.txt: fix 'see: above' note

2018-09-19 Thread Martin Ågren
Rather than saying "(see: above)", drop the colon. Also drop the comma before this note. Signed-off-by: Martin Ågren --- Documentation/git-config.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-config.txt b/Documentation/git-config

[PATCH] git.txt: mention mailing list archive

2018-09-19 Thread Martin Ågren
ned-off-by: Martin Ågren --- Documentation/git.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/git.txt b/Documentation/git.txt index 74a9d7edb4..40eaccafb2 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -858,7 +858,9 @@ Reporting Bugs

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

2018-09-19 Thread Martin Ågren
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 := command-list.h unicode-width.h Most of the things happening around here are obvious steps towards the end-

Re: [PATCH 2/2] git-config.txt: fix 'see: above' note

2018-09-19 Thread Martin Ågren
Hi Taylor, On Wed, 19 Sep 2018 at 19:21, Taylor Blau wrote: > I could take or leave 2/2, since I usually write ", (see: above)", but > I'm not sure if that's grammatically correct or not. Well, I sure ain't no grammar expert too... This is not a patch I feel strongly about, so I'll be happy to d

Re: [PATCH] pack-objects: handle island check for "external" delta base

2018-09-19 Thread Martin Ågren
On Wed, 19 Sep 2018 at 05:49, Jeff King wrote: > This is tricky to do inside a single "if" statement. And > after the merge in f3504ea3dd (Merge branch > 'cc/delta-islands', 2018-09-17), that "if" condition is > already getting pretty unwieldy. So this patch moves the > logic into a helper functio

Re: [PATCH] gc: fix regression in 7b0f229222 impacting --quiet

2018-09-19 Thread Martin Ågren
On Wed, 19 Sep 2018 at 23:04, Ævar Arnfjörð Bjarmason wrote: > Fix a regression in my recent 7b0f229222 ("commit-graph write: add > progress output", 2018-09-17), the newly added progress output for > "commit-graph write" didn't check the --quiet option. s/, t/. T/, perhaps. Maybe also s/did/does

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

2018-09-19 Thread Martin Ågren
On Wed, 19 Sep 2018 at 22:15, Ramsay Jones wrote: > On 19/09/18 18:49, Martin Ågren wrote: > > On Wed, 19 Sep 2018 at 02:07, Ramsay Jones > > wrote: > >> +GEN_HDRS := command-list.h unicode-width.h > > > > Most of the things happening around here are obviou

Re: [PATCH 3/4] git-commit-graph.txt: refer to "*commit* graph file"

2018-09-20 Thread Martin Ågren
On Thu, 20 Sep 2018 at 14:50, Derrick Stolee wrote: > > On 9/19/2018 12:30 PM, Martin Ågren wrote: > > The full name, by the way, is not the "commit-graph file" with a dash, > > cf. the synopsis. Use the dashless form. (The next commit will fix the > > remaining

Re: t7005-editor.sh failure

2018-09-26 Thread Martin Ågren
Hi Alexander, Welcome to the list! On Wed, 26 Sep 2018 at 08:54, Alexander Pyhalov wrote: > On updating git to 2.19 we've suddenly got t7005-editor.sh test failures. > The issue seems to be that generated "e space.sh" file can't handle > files with spaces. > Instead of 'echo space >$1' it should

Re: [PATCH] git.txt: mention mailing list archive

2018-09-26 Thread Martin Ågren
On Thu, 20 Sep 2018 at 21:07, Junio C Hamano wrote: > > Martin Ågren writes: > > > In the "Reporting Bugs" section of git(1), we refer to the mailing list, > > but we do not give any hint about where the archives might be found. > > And why is it a good idea

Re: t7005-editor.sh failure

2018-09-26 Thread Martin Ågren
On Wed, 26 Sep 2018 at 11:00, Alexander Pyhalov wrote: > As for sign-off, do I understand correctly that you just want to know > that I'm the original author of the code? Yes, it's so. Right. Plus that you agree that the code (the commit) may be redistributed basically forever. > I see this on O

Re: t7005-editor.sh failure

2018-09-26 Thread Martin Ågren
On Wed, 26 Sep 2018 at 13:59, Eric Sunshine wrote: > This description of the behavior is misleading (actually, actively > wrong). Hmm, that's bad, my apologies. > echo foo bar >cow > echo >cow foo bar > echo foo >cow bar > > That is, they all create a file named "cow" with content "f

[PATCH] t7005-editor: quote filename to fix whitespace-issue

2018-09-26 Thread Martin Ågren
edirect". More details can be found in [1], thanks to SZEDER Gábor. Make sure that the editor script quotes "$1" to remove the ambiguity. [1] https://public-inbox.org/git/20180926121107.GH27036@localhost/ Signed-off-by: Alexander Pyhalov Commit-message-by: Martin Ågren Signed-off-

[PATCH v2] git.txt: mention mailing list archive

2018-09-26 Thread Martin Ågren
hits first. Searching for some keyword about a bug or regression should pretty easily reveal whether it has been recently reported. Helped-by: Junio C Hamano Signed-off-by: Martin Ågren --- Thanks Junio and Taylor for thoughts on this. I agree we do not want to scare anyone away. I hope this does

Re: [PATCH v2] git.txt: mention mailing list archive

2018-09-27 Thread Martin Ågren
Hey On Thu, 27 Sep 2018 at 08:37, Jonathan Nieder wrote: > Martin Ågren wrote: > > > --- a/Documentation/git.txt > > +++ b/Documentation/git.txt > > @@ -859,6 +859,9 @@ Reporting Bugs > > Report bugs to the Git mailing list where the > > development and ma

[PATCH v2 4/4] Doc: refer to the "commit-graph file" with dash

2018-09-27 Thread Martin Ågren
. Do not change the references to the "commit graph" (without "... file") as a data structure. Signed-off-by: Martin Ågren --- Documentation/git-commit-graph.txt | 12 ++-- Documentation/technical/commit-graph.txt | 8 2 files changed, 10 insertions(+), 10

[PATCH v2 2/4] git-commit-graph.txt: typeset more in monospace

2018-09-27 Thread Martin Ågren
While we're here, fix an instance of "folder" to be "directory". Signed-off-by: Martin Ågren --- Documentation/git-commit-graph.txt | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Documentation/git-commit-graph.txt b/Documentation/g

[PATCH v2 0/4] git-commit-graph.txt: various cleanups

2018-09-27 Thread Martin Ågren
This v2 starts with the same two patches as v1 did, then goes on to change "[commit] graph file" to "commit-graph file" with a dash, to match other instances as well as Derrick's feedback. Martin Ågren (4): git-commit-graph.txt: fix bullet lists git-commit-graph.txt:

[PATCH v2 1/4] git-commit-graph.txt: fix bullet lists

2018-09-27 Thread Martin Ågren
We have a couple of bullet items which span multiple lines, and where we have prefixed each line with a `*`. (This might be the result of a text editor trying to help.) This results in each line being typeset as a separate bullet item. Drop the extra `*`. Signed-off-by: Martin Ågren

[PATCH v2 3/4] git-commit-graph.txt: refer to "*commit*-graph file"

2018-09-27 Thread Martin Ågren
graph files. Let's just write out the full name everywhere. The full name, by the way, is not the dash-less "commit graph file". Use the dashed form. (The next commit will fix the remaining few instances of the "commit graph file" in this document.) Signed-off-by: Martin Å

Re: [PATCH v2 0/4] git-commit-graph.txt: various cleanups

2018-09-27 Thread Martin Ågren
Hi Derrick On Thu, 27 Sep 2018 at 21:16, Derrick Stolee wrote: > Thanks! This version satisfies my concerns and looks good to me. > > Reviewed-by: Derrick Stolee Thanks for the spectacularly snappy review. I don't expect commit graphs to help my use cases a lot, but I still wanted to try them o

[PATCH] t1400: drop debug `echo` to actually execute `test`

2018-09-28 Thread Martin Ågren
Instead of running `test "foo" = "$(bar)"`, we prefix the whole thing with `echo`. Comparing to nearby tests makes it clear that this is just debug leftover. This line has actually been modified four times since it was introduced in e52290428b (General ref log reading improvements., 2006-05-19) and

Re: [PATCH] Documentation/CodingGuidelines: How to document new APIs

2018-09-28 Thread Martin Ågren
On Fri, 28 Sep 2018 at 18:51, Junio C Hamano wrote: > We recommend documenting in the header over documenting near the > implementation to encourage people to write the docs that are > readable without peeking at the implemention. s/implemention/implementation/ > - - When you come up with an API

Re: [PATCH 1/2] commit-graph: clean up leaked memory during write

2018-10-02 Thread Martin Ågren
ly need this hunk? In my testing with LeakSanitizer and valgrind, I don't need this hunk to be leak-free. Generally speaking, it seems impossible to UNLEAK when dying, since we don't know what we have allocated higher up in the call-stack. Without this hunk, this patch can have my Reviewed

Re: [PATCH 1/2] commit-graph: clean up leaked memory during write

2018-10-02 Thread Martin Ågren
On Tue, 2 Oct 2018 at 19:59, Stefan Beller wrote: > > > + > > > + string_list_clear(&list, 0); > > > } > > > > Nit: The blank line adds some asymmetry, IMVHO. > > I think these blank lines are super common, as in: > > { > declarations; > > multiple; > lines(of); >

Re: [PATCH 3/5] diff --color-moved-ws: fix a memory leak

2018-10-03 Thread Martin Ågren
On Tue, 2 Oct 2018 at 20:04, Phillip Wood wrote: > const struct emitted_diff_symbol *longer = a->len > b->len ? a : b; > const struct emitted_diff_symbol *shorter = a->len > b->len ? b : a; > int d = longer->len - shorter->len; > + int ret = !strncmp(longer->line + d

[PATCH 1/2] commit-graph: free `struct packed_git` after closing it

2018-10-03 Thread Martin Ågren
`close_pack(p)` does not free the memory which `p` points to, so follow up with a call to `free(p)`. All other users of `close_pack()` look ok. Signed-off-by: Martin Ågren --- commit-graph.c | 1 + 1 file changed, 1 insertion(+) diff --git a/commit-graph.c b/commit-graph.c index 3d644fddc0

[PATCH 2/2] builtin/commit-graph.c: UNLEAK variables

2018-10-03 Thread Martin Ågren
to exit, let's just UNLEAK the whole string list instead. UNLEAK `graph` in `graph_verify`. While at it, and for consistency, UNLEAK in `graph_read()` as well, and remove an unnecessary UNLEAK just before dying. Signed-off-by: Martin Ågren --- builtin/commit-graph.c | 11 ++- 1

[PATCH 0/2] commit-graph: more leak fixes

2018-10-03 Thread Martin Ågren
this posting, I'll follow through as appropriate. Martin Martin Ågren (2): commit-graph: free `struct packed_git` after closing it builtin/commit-graph.c: UNLEAK variables builtin/commit-graph.c | 11 ++- commit-graph.c | 1 + 2 files changed, 7 insertions(+), 5

Re: [PATCH 0/2] commit-graph: more leak fixes

2018-10-03 Thread Martin Ågren
On Wed, 3 Oct 2018 at 18:19, Derrick Stolee wrote: > I'm fine with squashing it in with both our sign-offs. It is the same > idea, it just requires a different set of arguments to hit it. I'll > adjust the commit message as necessary. > I'll add your PATCH 2/2 to my v2. Thanks! Cool, thanks a lo

Re: [PATCH v2 05/36] refspec: convert valid_fetch_refspec to use parse_refspec

2018-06-03 Thread Martin Ågren
Hi Brandon, On 17 May 2018 at 00:57, Brandon Williams wrote: > Convert 'valid_fetch_refspec()' to use the new 'parse_refspec()' > function to only parse a single refspec and eliminate an allocation. > > Signed-off-by: Brandon Williams > --- > refspec.c | 17 - > refspec.h | 3 +

[PATCH] refspec: initalize `refspec_item` in `valid_fetch_refspec()`

2018-06-04 Thread Martin Ågren
oked by calling `valid_fetch_refspec(":*")`. Zero the struct, as is done in other users of `struct refspec_item`. Signed-off-by: Martin Ågren --- I found some time to look into this. It does not seem to be a user-visible bug, so not particularly critical. refspec.c | 5 - 1 file changed, 4

Re: [PATCH] refspec: initalize `refspec_item` in `valid_fetch_refspec()`

2018-06-04 Thread Martin Ågren
On 4 June 2018 at 23:55, Ævar Arnfjörð Bjarmason wrote: > I think this makes more sense instead of this fix: [...] > -void refspec_item_init(struct refspec_item *item, const char *refspec, int > fetch) > +int refspec_item_init(struct refspec_item *item, const char *refspec, int > fetch) > { >

Re: [PATCH 0/3] refspec: refactor & fix free() behavior

2018-06-05 Thread Martin Ågren
p your diff into two different patches to make it clear that > all callers of refpsec_item_init relying on dieing. Me too. >> Martin Ågren (1): >> refspec: initalize `refspec_item` in `valid_fetch_refspec()` I was a bit surprised at first that this wasn't a "while at it&quo

Re: [PATCH 09/20] abbrev tests: test for "git-log" behavior

2018-06-09 Thread Martin Ågren
On 9 June 2018 at 00:41, Ævar Arnfjörð Bjarmason wrote: > The "log" family of commands does its own parsing for --abbrev in > revision.c, so having dedicated tests for it makes sense. > +for i in $(test_seq 4 40) I've just been skimming so might have missed something, but I see several instances

Re: [PATCH] fsck: avoid looking at NULL blob->object

2018-06-09 Thread Martin Ågren
On 9 June 2018 at 10:32, Jeff King wrote: > Except it _does_ do one non-trivial thing, which is call the > report() function, which wants us to pass a pointer to a > "struct object". Which we don't have (we have only a "struct > object_id"). So we erroneously passed the NULL object, which s/passe

Re: [PATCH] fsck: avoid looking at NULL blob->object

2018-06-09 Thread Martin Ågren
On 9 June 2018 at 11:21, Jeff King wrote: > On Sat, Jun 09, 2018 at 10:50:36AM +0200, Martin Ågren wrote: > >> On 9 June 2018 at 10:32, Jeff King wrote: >> > Except it _does_ do one non-trivial thing, which is call the >> > report() function, which wants us to pa

Re: [PATCH 09/20] abbrev tests: test for "git-log" behavior

2018-06-09 Thread Martin Ågren
On 9 June 2018 at 11:56, Ævar Arnfjörð Bjarmason wrote: > > On Sat, Jun 09 2018, Martin Ågren wrote: > >> On 9 June 2018 at 00:41, Ævar Arnfjörð Bjarmason wrote: >>> The "log" family of commands does its own parsing for --abbrev in >>> revision.c, s

Re: [PATCH 17/20] abbrev: unify the handling of empty values

2018-06-09 Thread Martin Ågren
On 9 June 2018 at 00:41, Ævar Arnfjörð Bjarmason wrote: > For no good reason the --abbrev= command-line option was less strict > than the core.abbrev config option, which came down to the latter > using git_config_int() which rejects an empty string, but the rest of > the parsing using strtoul() w

Re: [PATCH 17/20] abbrev: unify the handling of empty values

2018-06-09 Thread Martin Ågren
On 9 June 2018 at 16:24, Martin Ågren wrote: > On 9 June 2018 at 00:41, Ævar Arnfjörð Bjarmason wrote: >> For no good reason the --abbrev= command-line option was less strict >> than the core.abbrev config option, which came down to the latter >> using git_config_int() w

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

2018-06-09 Thread Martin Ågren
On 9 June 2018 at 00:41, Ævar Arnfjörð Bjarmason wrote: > diff --git a/Documentation/config.txt b/Documentation/config.txt > index ab641bf5a9..abf07be7b6 100644 > --- a/Documentation/config.txt > +++ b/Documentation/config.txt > @@ -919,6 +919,12 @@ core.abbrev:: > in your repository, whic

Re: [PATCH 20/20] abbrev: add a core.validateAbbrev setting

2018-06-09 Thread Martin Ågren
On 9 June 2018 at 00:41, Ævar Arnfjörð Bjarmason wrote: > Instead of trying really hard to find an unambiguous SHA-1 we can with > core.validateAbbrev=false, and preferably combined with the new > support for relative core.abbrev values (such as +4) unconditionally > print a short SHA-1 without d

Re: [PATCH 4/8] gpg-interface: introduce an abstraction for multiple gpg formats

2018-07-04 Thread Martin Ågren
Hi Henning, On 3 July 2018 at 14:38, Henning Schild wrote: > Create a struct that holds the format details for the supported formats. > At the moment that is still just "PGP". This commit prepares for the > introduction of more formats, that might use other programs and match > other signatures.

Re: Re* [Breakage] 2.20.0-rc0 t1404: test_i18ngrep reports 1 instead of 0 on NonStop in one case

2019-02-14 Thread Martin Ågren
On Fri, 15 Feb 2019 at 03:13, Junio C Hamano wrote: > > Subject: [PATCH] t1404: do not rely on the exact phrasing of strerror() > > Not even in C locale, it is wrong to expect that the exact phrasing > "File exists" is used to show EEXIST. s/Not even/Even/? Or s/wrong to expect that/portable to r

Re: [PATCH v3 2/2] setup: fix memory leaks with `struct repository_format`

2019-02-25 Thread Martin Ågren
On Fri, 25 Jan 2019 at 20:51, Jeff King wrote: > > > On Wed, 23 Jan 2019 at 06:57, Jeff King wrote: > > > > > > On Tue, Jan 22, 2019 at 10:45:48PM +0100, Martin Ågren wrote: > > > > > > > Call `clear_...()` at the start of `read_...()` inst

[PATCH 1/3] Documentation/Makefile: add missing xsl dependencies for manpages

2019-02-25 Thread Martin Ågren
ng a dependency. Signed-off-by: Martin Ågren --- Documentation/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 26a2342bea..0f8054a115 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @

[PATCH 2/3] Documentation/Makefile: add missing dependency on asciidoctor-extensions

2019-02-25 Thread Martin Ågren
anges so rarely, that should be ok. It's better than missing a dependency. Signed-off-by: Martin Ågren --- Documentation/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 0f8054a115..a9697f5146 100644 --- a/Document

[PATCH 0/3] asciidoctor-extensions: fix spurious space after linkgit

2019-02-25 Thread Martin Ågren
with that final patch. Patch 1/3 isn't needed for this series, but could help someone in the future, similar to how already having patch 2/3 would have helped me... Martin Ågren (3): Documentation/Makefile: add missing xsl dependencies for manpages Documentation/Makefile: add missing depen

[PATCH 3/3] asciidoctor-extensions: fix spurious space after linkgit

2019-02-25 Thread Martin Ågren
t no. We get "... for more" in the XML, see, e.g., git-am.xml, so the space ends up in git-am.1 just fine. Signed-off-by: Martin Ågren --- Documentation/asciidoctor-extensions.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/asciidoctor-extensions

Re: [PATCH 1/3] Documentation/Makefile: add missing xsl dependencies for manpages

2019-02-25 Thread Martin Ågren
On Mon, 25 Feb 2019 at 21:08, Eric Sunshine wrote: > > On Mon, Feb 25, 2019 at 3:03 PM Martin Ågren wrote: > > These stylesheets very rarely change, but when they do, it really helps > > if the manpages depend on them. We're casting the net a bit too wide > > here

Re: [PATCH 1/3] Documentation/Makefile: add missing xsl dependencies for manpages

2019-02-25 Thread Martin Ågren
On Mon, 25 Feb 2019 at 22:01, Eric Sunshine wrote: > > On Mon, Feb 25, 2019 at 3:29 PM Martin Ågren wrote: > > On Mon, 25 Feb 2019 at 21:08, Eric Sunshine wrote: > > > > > > The wildcard expression also matches the manpage-base-url.xsl > > > mentioned e

Re: [PATCH 0/3] asciidoctor-extensions: fix spurious space after linkgit

2019-02-25 Thread Martin Ågren
On Tue, 26 Feb 2019 at 04:22, brian m. carlson wrote: > > Thanks for putting this series together. I would suggest an update to > the commit message in 1/3 explaining the edge case that Eric Sunshine > mentioned, but otherwise, I think this looks good. Thank you. I'll do that, after waiting for a

Re: [PATCH 1/1] tests: replace `test -(d|f)` with test_path_is_(dir|file)

2019-02-26 Thread Martin Ågren
On Tue, 26 Feb 2019 at 14:43, Rohit Ashiwal via GitGitGadget wrote: > > t3600-rm.sh: Previously we were using `test -(d|f)` > to verify the presencee of a directory/file, but we > already have helper functions, viz, test_path_is_dir > and test_path_is_file with same functionality. This > patch wil

Re: [PATCH 1/1] tests: replace `test -(d|f)` with test_path_is_(dir|file)

2019-02-26 Thread Martin Ågren
On Tue, 26 Feb 2019 at 21:02, Rohit Ashiwal wrote: > > Hey! > > On Wed, Feb 27, 2019 at 1:22 AM Johannes Schindelin > wrote: > > > > We already have `test_path_is_missing`. Why not use that instead of `! > > test -d` or `! test -f`? > > > > Yes, I think this is better. It will satisfy all the req

[PATCH v2 0/3] asciidoctor-extensions: fix spurious space after linkgit

2019-02-27 Thread Martin Ågren
depend on. Thanks Eric and brian for your comments on v1. [1] https://public-inbox.org/git/cover.1551123979.git.martin.ag...@gmail.com/ Martin Ågren (3): Documentation/Makefile: add missing xsl dependencies for manpages Documentation/Makefile: add missing dependency on asciidoctor-extensions

[PATCH v2 3/3] asciidoctor-extensions: fix spurious space after linkgit

2019-02-27 Thread Martin Ågren
t no. We get "... for more" in the XML, see, e.g., git-am.xml, so the space ends up in git-am.1 just fine. Signed-off-by: Martin Ågren --- Documentation/asciidoctor-extensions.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/asciidoctor-extensions

[PATCH v2 1/3] Documentation/Makefile: add missing xsl dependencies for manpages

2019-02-27 Thread Martin Ågren
ng a dependency. Observe that manpage-base-url.xsl is a generated file, so we need to list it explicitly, besides the `wildcard` expression we're adding here. Signed-off-by: Martin Ågren --- Documentation/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docu

[PATCH v2 2/3] Documentation/Makefile: add missing dependency on asciidoctor-extensions

2019-02-27 Thread Martin Ågren
anges so rarely, that should be ok. It's better than missing a dependency. Signed-off-by: Martin Ågren --- Documentation/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 0f8054a115..a9697f5146 100644 --- a/Document

Re: [PATCH 1/3] Documentation/Makefile: add missing xsl dependencies for manpages

2019-02-27 Thread Martin Ågren
On Tue, 26 Feb 2019 at 13:47, Eric Sunshine wrote: > > On Tue, Feb 26, 2019 at 12:59 AM Martin Ågren wrote: > > Were you perhaps mislead by one of the similarly-named files? > > Yes, I was misled by similar names. Sorry for the noise. Hey, no problem. And thanks for the

Re: [PATCH] rebase docs: fix "gitlink" typo

2019-02-28 Thread Martin Ågren
On Thu, 28 Feb 2019 at 03:44, Kyle Meyer wrote: > Change it to "linkgit" so that the reference is properly rendered. > have `` as direct ancestor will keep their original branch point, > -i.e. commits that would be excluded by gitlink:git-log[1]'s > +i.e. commits that would be excluded by linkg

[PATCH v4 2/2] setup: fix memory leaks with `struct repository_format`

2019-02-28 Thread Martin Ågren
t;. Both are signalled through `version == -1` and now both cause us to clear any partial configuration we have picked up. For "extensions.*", that's fine, since they require a positive version number. For "core.bare" and "core.worktree", we're already veri

[PATCH v4 0/2] setup: fix memory leaks with `struct repository_format`

2019-02-28 Thread Martin Ågren
ssion. Martin [1] https://public-inbox.org/git/cover.1548186510.git.martin.ag...@gmail.com/ Martin Ågren (2): setup: free old value before setting `work_tree` setup: fix memory leaks with `struct repository_format` cache.h | 31 --- builtin/init-db.c

[PATCH v4 1/2] setup: free old value before setting `work_tree`

2019-02-28 Thread Martin Ågren
Before assigning to `data->work_tree` in `read_worktree_config()`, free any value we might already have picked up, so that we do not leak it. Signed-off-by: Martin Ågren Signed-off-by: Junio C Hamano --- setup.c | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.c b/setup.c in

[PATCH 0/5] fixing a few Asciidoc/tor differences

2019-03-05 Thread Martin Ågren
where Asciidoctor trips on something, but Asciidoc doesn't. There's the other way around. And sometimes they both stumble, but differently. Based on maint. Martin Ågren (5): config/diff.txt: drop spurious backtick config/fsck.txt: avoid starting line with dash git.txt: remove empty l

[PATCH 1/5] config/diff.txt: drop spurious backtick

2019-03-05 Thread Martin Ågren
Signed-off-by: Martin Ågren --- Documentation/config/diff.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt index e48bb987d7..7a1bae116a 100644 --- a/Documentation/config/diff.txt +++ b/Documentation/config

[PATCH 5/5] Documentation: turn middle-of-line tabs into spaces

2019-03-05 Thread Martin Ågren
`git grep "[a-zA-Z.,)]$TAB[a-zA-Z]"`. Signed-off-by: Martin Ågren --- Documentation/config/diff.txt | 2 +- Documentation/config/gc.txt | 2 +- Documentation/config/gpg.txt| 2 +- Documentation/git-config.txt| 2 +- Documentation/git-grep.txt | 2 +-

[PATCH 2/5] config/fsck.txt: avoid starting line with dash

2019-03-05 Thread Martin Ågren
This dash at the start of the line causes Asciidoctor to trip on the list continuations that follow and to render the pluses literally. Rewrap a little to put the dash elsewhere. Signed-off-by: Martin Ågren --- Documentation/config/fsck.txt | 6 +++--- 1 file changed, 3 insertions(+), 3

[PATCH 4/5] git-svn.txt: drop escaping '\' that ends up being rendered

2019-03-05 Thread Martin Ågren
Escaping two *'s as "\*\*" apparently makes Asciidoctor render the second backslash literally, so we end up with "*\*". So let's not escape that second asterisk. The result is now "**" as intended, both in AsciiDoc and Asciidoctor. Signed-off-by: Martin Åg

[PATCH 3/5] git.txt: remove empty line before list continuation

2019-03-05 Thread Martin Ågren
This patch is a no-op for Asciidoctor, but makes AsciiDoc render this as intended. Signed-off-by: Martin Ågren --- Documentation/git.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Documentation/git.txt b/Documentation/git.txt index 00156d64aa..6d1f2fd9ae 100644 --- a/Documentation

Re: [PATCH 1/1] git-clean.txt: specify core.excludesFile variable is used

2019-03-06 Thread Martin Ågren
On Wed, 6 Mar 2019 at 12:17, Denton Liu wrote: > > In the git-clean documentation, -x and -e documented .gitignore, > $GIT_DIR/info/excludes but neglected to mention the file pointed to by > core.excludesFile. Nit: I suppose it doesn't so much document it, as mention it. So In the git-clean do

Re: [PATCH v2 1/1] git-clean.txt: clarify ignore pattern files

2019-03-06 Thread Martin Ågren
On Thu, 7 Mar 2019 at 07:57, Junio C Hamano wrote: > > Denton Liu writes: > > > + Use the exclude pattern in addition to those found in > > + `.gitignore` and similar files (see linkgit:gitignore[5]). > I do agree with the direction to abandon the attempt to be > exhaustive, which has fa

Re: [PATCH v3 04/21] git-checkout.txt: fix monospace typeset

2019-03-09 Thread Martin Ågren
it) in the next commit. Martin -- >8 -- Subject: git-checkout.txt: add more backticks for monospacing Add backticks where we have none, replace single quotes with backticks and replace double-quotes. Drop double-quotes from nested constructions such as `"@{-1}"`. Add

Re: [PATCH v3 10/21] checkout: split part of it to new command 'switch'

2019-03-09 Thread Martin Ågren
On Fri, 8 Mar 2019 at 11:00, Nguyễn Thái Ngọc Duy wrote: > --- (Missing signed-off-by.) > --- /dev/null > +++ b/Documentation/git-switch.txt > @@ -0,0 +1,259 @@ It looks like you base this on git-checkout.txt, which makes sense. > +--recurse-submodules:: > +--no-recurse-submodules:: > +

[PATCH 0/2] fix spurious space after linkgit, now in *.html

2019-03-10 Thread Martin Ågren
On Sun, 3 Mar 2019 at 02:25, Junio C Hamano wrote: > > "brian m. carlson" writes: > > > On Wed, Feb 27, 2019 at 07:17:51PM +0100, Martin Ågren wrote: > >> Just like v1 [1], this v2 removes a spurious space which shows up in a > >> large number of plac

[PATCH 2/2] asciidoctor-extensions: fix spurious space after linkgit in *.html

2019-03-10 Thread Martin Ågren
into a space before punctuation. Just like with c3b4efa030, note that if what follows is a word, not punctuation, the white space renders just fine. So constructions such as "see linkgit:foo[1] for more" still render as intended. Signed-off-by: Martin Ågren --- Documentation/ascii

[PATCH 1/2] Documentation/Makefile: add missing dependencies on asciidoctor-extensions

2019-03-10 Thread Martin Ågren
ender user-manual.html by going through an intermediate user-manual.xml, which is an explicit, special-cased target. Add the missing dependency to user-manual.xml. Signed-off-by: Martin Ågren --- Documentation/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Docu

Re: [PATCH 0/2] fix spurious space after linkgit, now in *.html

2019-03-10 Thread Martin Ågren
On Mon, 11 Mar 2019 at 04:02, Junio C Hamano wrote: > > Martin Ågren writes: > > > Since this has hit "next", here are two patches on top to address this. > > > > Sorry about this. > > Thanks. > > If it makes it easier, we can eject ma/asciidoctor

Re: [PATCH 0/2] fix spurious space after linkgit, now in *.html

2019-03-10 Thread Martin Ågren
On Mon, 11 Mar 2019 at 03:59, Jeff King wrote: > > On Sun, Mar 10, 2019 at 04:14:22PM +0100, Martin Ågren wrote: > > > [1] I could have sworn I checked the html docs and saw that they didn't > > have this extra space. Looking at git-scm.com again reveals that it's

Re: [PATCH v3 04/21] git-checkout.txt: fix monospace typeset

2019-03-11 Thread Martin Ågren
On Mon, 11 Mar 2019 at 10:35, Duy Nguyen wrote: > > On Sat, Mar 9, 2019 at 7:35 PM Martin Ågren wrote: > > > @@ -285,7 +285,7 @@ Note that this option uses the no overlay mode by > > default (see also > The part not shown here is > > Using `--recurse-submodul

Re: [PATCH 0/2] fix spurious space after linkgit, now in *.html

2019-03-11 Thread Martin Ågren
On Mon, 11 Mar 2019 at 10:24, Junio C Hamano wrote: > > Martin Ågren writes: > > > Ok, then I'll take that offer. I'll squash these two patches into the > > original series. Thanks. > > Our mails might cross, but just in case you haven't started, he

[PATCH] asciidoctor-extensions: provide ``

2019-03-17 Thread Martin Ågren
asciidoc.conf does. We'll make it fairly obvious that we aim to inject the exact same three lines of `` that asciidoc.conf provides. The only somewhat tricky part is that we inject them *post*-processing so we need to do the variable expansion ourselves. Signed-off-by: Martin Ågren ---

[PATCH 0/4] doc-diff: support diffing from/to AsciiDoc(tor)

2019-03-17 Thread Martin Ågren
om/ [2] After [1], the date in the footer is still formatted differently here. It might be a locale thing, and I tend to shy away from even trying to understand those. :-/ Martin Ågren (4): Doc: auto-detect changed build flags doc-diff: let `render_tree()` take an explicit directory name

<    1   2   3   4   5   6   7   8   >