lting in
a misrendered ASCII drawing. Use an explicit literal block to indicate
to Asciidoctor that we want to keep the leading whitespace. Drop the
common indentation for all lines to make this a no-op with AsciiDoc.
Signed-off-by: Martin Ågren
---
Documentation/user-manual.txt | 20 +++---
because user-manual.txt is the only file
we process this way (and it's immediately in Documentation/).
Signed-off-by: Martin Ågren
---
Documentation/asciidoctor-extensions.rb | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Documentation/asciidoctor-extensio
etting 2.x to build the docs.
Martin
Martin Ågren (4):
user-manual.txt: add missing section label
user-manual.txt: change header notation
asciidoctor-extensions.rb: handle "book" doctype in linkgit
user-manual.txt: render ASCII art correctly under Asciidoctor
Documentation/ascii
We provide a label for each chapter and section except for the "Pitfalls
with submodules" section. Since we're doing it everywhere else, let's do
it here, too.
Signed-off-by: Martin Ågren
---
Documentation/user-manual.txt | 1 +
1 file changed, 1 insertion(+)
diff --git
iDoc.
Changing the book title at the start of the document to similarly use
"=" instead of a line of equal signs makes no difference with any of the
engines, but let's do that change anyway for consistency.
Signed-off-by: Martin Ågren
---
Documentation/user-manual.txt | 356 +
we
can handle the conditional allocation early before going on to populate
the struct. No need for goto-ing.
Signed-off-by: Martin Ågren
---
Hi SZEDER,
For the record, --color-moved confirms that your patch is a move and
the conversion around it looks good to me. I was a bit puzzled by what
the
Hi Junio,
On Thu, 19 Sep 2019 at 01:44, Junio C Hamano wrote:
> * ma/asciidoctor-refmiscinfo (2019-09-16) 3 commits
> - doc-diff: replace --cut-header-footer with --cut-footer
> - asciidoctor-extensions: provide ``
> - Doc/Makefile: give mansource/-version/-manual attributes
>
> Update suppo
On Mon, 16 Sep 2019 at 22:46, Johannes Sixt wrote:
>
> Am 16.09.19 um 21:58 schrieb Junio C Hamano:
> > I wonder if the result becomes even clearer if we dropped "instead
> > of the usual output". It is a given that presence of an option
> > would change the behaviour, so "instead of the usual" d
essions. Rather than simply adding such an option, let's
also drop `--cut-header-footer`, i.e., rework it to lose the "header"
part of its name and functionality.
`--cut-header-footer` is just a developer tool and it probably has no
more than a handful of users, so we can afford to be
-inbox.org/git/20190915224332.103930-1-sand...@crustytoothpaste.net/
Martin Ågren (3):
Doc/Makefile: give mansource/-version/-manual attributes
asciidoctor-extensions: provide ``
doc-diff: replace --cut-header-footer with --cut-footer
Documentation/Makefile | 3 ++-
D
version` [2], and older
versions don't pick up any of these attributes. -- We'll fix that with a
bit of a hack in the next commit.
[1] https://asciidoctor.org/docs/user-manual/#man-pages
[2] Note how [1] says "Not used by Asciidoctor".
Signed-off-by: Martin Ågren
---
Documen
ring" and I
stopped there.
I don't think it's unlikely that doing a plain old search-and-replace
will work just as fine or better compared to parsing XML and worrying
about libraries and library versions.
[1] https://asciidoctor.org/docs/user-manual/#builtin-attributes
[2] ht
On Sun, 15 Sep 2019 at 21:26, Johannes Sixt wrote:
> I do not have the toolchain to check that a correct result is produced.
But I do. I've tested this patch and 2/2 with AsciiDoc 8.6.10 and
Asciidoctor 1.5.5, as well as with Asciidoctor 2.0.10 (on top of brian's
recent patch so that it builds t
On Sun, 15 Sep 2019 at 23:26, brian m. carlson
wrote:
>
> On 2019-09-15 at 09:59:52, SZEDER Gábor wrote:
> > On Sat, Sep 14, 2019 at 07:49:19PM +, brian m. carlson wrote:
> > > test -n "$ALREADY_HAVE_ASCIIDOCTOR" ||
> > > gem install --version 1.5.8 asciidoctor
> >
> > So, since the do
On Fri, 13 Sep 2019 at 07:06, Jeff King wrote:
>
> On Fri, Sep 13, 2019 at 01:52:40AM +, brian m. carlson wrote:
>
>
> > Documentation/Makefile| 4 +++-
> > Documentation/manpage.xsl | 3 +++
> > ci/test-documentation.sh | 2 ++
> > 3 files changed, 8 insertions(+), 1 deletion(-)
> > cr
On Fri, 13 Sep 2019 at 06:48, Jeff King wrote:
>
> On Sat, Sep 07, 2019 at 04:12:46PM +0200, Martin Ågren wrote:
>
> > This series roughly halves the line count of `./doc-diff --from-asciidoc
> > --to-asciidoctor --cut-header-footer HEAD HEAD`. Together with my recent
&
Hi Junio,
On Sun, 8 Sep 2019 at 14:51, Junio C Hamano wrote:
>
> * ma/asciidoctor-refmiscinfo (2019-09-03) 2 commits
> - doc-diff: replace --cut-header-footer with --cut-footer
> - asciidoctor-extensions: provide ``
>
> Update support for Asciidoctor documentation toolchain.
>
> Will merge to
t;. Also drop some of the horizontal space between
the two columns so that we fit into 80 columns. This changes the
rendering with both AsciiDoc and Asciidoctor. They now render this
identically, nicely aligned, and within 80 columns.
Signed-off-by: Martin Ågren
---
Documentation
whole paragraph to using backticks rather than
pluses. That worked great with Asciidoctor, but confused AsciiDoc...
Let's go with this rather surgical change instead.
Signed-off-by: Martin Ågren
---
Documentation/gitweb.conf.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff
r to spell "". Let's stick to the file-local convention
there.
Signed-off-by: Martin Ågren
---
Documentation/config.txt | 84
Documentation/git-config.txt | 56 +++--
Documentation/git-send-email.txt | 12 +++--
Doc
be to replace tabs 2-N on each line with
eight spaces. But let's follow the example set by 379805051d, so that we
can use our preferred way of indenting.
Signed-off-by: Martin Ågren
---
Documentation/git-merge-base.txt | 98 +++-
1 file changed, 57 insertion
gives us some extra indentation, we
can remove the one that we have been carrying explicitly. That is, drop
the first tab of indentation on each line. With AsciiDoc, this results
in identical rendering before and after this commit. Asciidoctor now
renders this the same as AsciiDoc does.
Signed-
s.
Signed-off-by: Martin Ågren
---
Documentation/git-receive-pack.txt | 52 --
1 file changed, 28 insertions(+), 24 deletions(-)
diff --git a/Documentation/git-receive-pack.txt
b/Documentation/git-receive-pack.txt
index dedf97efbb..25702ed730 100644
--- a/Documen
y drifted apart. I consider such an investigation and possible
cleanup as out of scope for this commit and this patch series.
Signed-off-by: Martin Ågren
---
Documentation/git-commit.txt | 8 +---
Documentation/git-status.txt | 18 +++---
2 files changed, 16 insertions(+), 10 del
n the meantime. Maybe I've made the
wrong call here -- Junio, if you'd rather have me submit this on master,
just let me know.
[1] https://public-inbox.org/git/cover.1567534373.git.martin.ag...@gmail.com/
Martin Ågren (7):
Documentation: wrap blocks with "--"
git-merge-ba
On Sat, 7 Sep 2019 at 08:45, Jeff King wrote:
>
> On Thu, Sep 05, 2019 at 09:35:10PM +0200, Martin Ågren wrote:
>
> > > Yeah, I do still like that as an endgame, but I like what you have here
> > > as an intermediate step in the right direction.
> >
> > H
On Wed, 4 Sep 2019 at 05:26, Jeff King wrote:
>
> On Tue, Sep 03, 2019 at 08:51:19PM +0200, Martin Ågren wrote:
>
> > When I posted v1, it turned into quite a thread [1] on AsciiDoc vs
> > Asciidoctor vs Asciidoctor 2.0 and differences in rendering. (I am on
> > Asciido
On Wed, 4 Sep 2019 at 01:16, brian m. carlson
wrote:
>
> I looked at this series and it seems sane. I agree that adding a
> dependency on nokogiri isn't really desirable. It is an extremely
> common Ruby package, but it has native extensions, which causes problems
> for some people if their dist
essions. Rather than simply adding such an option, let's
also drop `--cut-header-footer`, i.e., rework it to lose the "header"
part of its name and functionality.
`--cut-header-footer` is just a developer tool and it probably has no
more than a handful of users, so we can afford be aggre
ries
should appear on the list within the next couple of days. After that,
there's user-manual.html/pdf that needs looking into...)
[1]
https://public-inbox.org/git/20190317144747.2418514-1-martin.ag...@gmail.com/
Martin Ågren (2):
asciidoctor-extensions: provide ``
doc-diff: replace --cu
bled with ruby outside of this very file, I might be
missing something obvious, but I don't think it's unlikely that doing a
plain old search-and-replace will work just as fine or better compared
to parsing XML and worrying about libraries and library versions.
[1] https://asciidoctor
On Thu, 29 Aug 2019 at 20:28, Thomas Gummerer wrote:
> +int repo_refresh_and_write_index(struct repository *repo,
> +unsigned int refresh_flags,
> +unsigned int write_flags,
> +const struct pathspec *p
On Fri, 30 Aug 2019 at 16:00, David Turner wrote:
>
> Signed-off-by: David Turner
> ---
> Documentation/gitremote-helpers.txt | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/gitremote-helpers.txt
> b/Documentation/gitremote-helpers.txt
> index 43f80c
On Thu, 29 Aug 2019 at 23:06, David Turner wrote:
> -Optionally may output a 'lock ' line indicating a file under
> -GIT_DIR/objects/pack which is keeping a pack until refs can be
> -suitably updated.
> +Optionally may output a 'lock ' line indicating the full path of
> +a file under under GIT_DI
On Thu, 29 Aug 2019 at 22:08, René Scharfe wrote:
>
> Am 29.08.19 um 21:40 schrieb Martin Ågren:
> > On Thu, 29 Aug 2019 at 21:15, René Scharfe wrote:
> >> diff --git a/help.h b/help.h
> >> index b8780fbd0f..7a455beeb7 100644
> >> --- a/help.h
> &
On Thu, 29 Aug 2019 at 21:15, René Scharfe wrote:
>
> Announce that calling help_unknown_ref() exits the program.
>
> Signed-off-by: René Scharfe
> ---
> Patch generated with --function-context for easier review.
>
> help.c | 3 ++-
> help.h | 2 +-
> 2 files changed, 3 insertions(+), 2 deletion
Hiya,
On Wed, 28 Aug 2019 at 21:15, Sergey Organov wrote:
> > I was sort of expecting these to be listed in the order "--ff, --no-ff,
> > --ff-only", and I see Sergey suggested the same ordering. The way your
> > proposed text reads does make sense though... Would it read as well
> > turning it o
Hi Elijah,
On Wed, 28 Aug 2019 at 17:52, Elijah Newren wrote:
> ---ff::
> - When the merge resolves as a fast-forward, only update the branch
> - pointer, without creating a merge commit. This is the default
> - behavior.
> -
> +--ff-only::
> --no-ff::
> - Create a merge
On Tue, 27 Aug 2019 at 12:15, Thomas Gummerer wrote:
> struct lock_file lock = LOCK_INIT;
> const char *head_arg = "HEAD";
>
> - hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
> - refresh_cache(REFRESH_QUIET);
> - if (write_locked_index(&the_index, &lock,
> -
On Tue, 27 Aug 2019 at 12:14, Thomas Gummerer wrote:
>
> Getting the lock for the index, refreshing it and then writing it is a
> pattern that happens more than once throughout the codebase. Factor
> out the refresh_and_write_cache function from builtin/am.c to
> read-cache.c, so it can be re-use
g
included in the whitelist. If this were a blacklist, the consequences of
a misspelled target could be a lot more severe.
Disclaimer: This is the outcome of a combination of copy-paste and
trial and error -- better solutions might be possible...
Signed-off-by: Martin Ågren
---
I suppose this c
On Wed, 7 Aug 2019 at 20:57, Josh Steadmon wrote:
>
> This series adds a new pre-merge-commit hook, similar in usage to
> pre-commit. It also improves hook testing in t7503, by verifying that
> the correct hooks are run or bypassed as expected.
>
> The original series was done by Michael J Gruber
ke.
Perhaps it's overkill to check that `git tag -d` didn't decide to
*create* a tag. But since we're trying to be this careful, let's
actually check the correct tag. While we're doing this, let's use a more
descriptive tag name instead -- "nonexistingtag" sh
On Thu, 8 Aug 2019 at 06:09, Phil Hord wrote:
> I have a repo with 24,000 tags, most of which are not useful to any
> developers. Having this many refs slows down many operations that
> would otherwise be very fast. Removing these tags when they've been
> accidentally fetched again takes about 30
On Fri, 2 Aug 2019 at 00:20, Josh Steadmon wrote:
>
> t7503 did not verify that the expected hooks actually ran during
> testing. Fix that by making the hook scripts write their $0 into a file
> so that we can compare actual execution vs. expected execution.
It could be argued that this test is p
Signed-off-by: Martin Ågren
---
t/t7503-pre-commit-and-pre-merge-commit-hooks.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh
b/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh
index 86a375ab3e..5cc6c98375 100755
--- a
;t start affecting later tests too.
Signed-off-by: Martin Ågren
---
...3-pre-commit-and-pre-merge-commit-hooks.sh | 60 +++
1 file changed, 20 insertions(+), 40 deletions(-)
diff --git a/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh
b/t/t7503-pre-commit-and-pre-merge-commit-ho
If we fail to call the hook, we won't append to "actual_hooks".
"test_cmp" is able to handle a missing file just fine, so these
"pre-creations" are mostly confusing. Let's drop them.
Signed-off-by: Martin Ågren
--
This "pre-creation" does pr
one when they're both available.
Feel free to pick and squash as you see fit. (I don't think it makes
sense to have these go in as-are. They really are meant for squashing.)
Martin
Martin Ågren (5):
t7503: use "&&" in "test_when_finished" rather than
AFAIU, we avoid using `touch` unless we really do want to update the
mtime. Here, we just want to create empty files, so write `>foo`
instead.
Signed-off-by: Martin Ågren
---
...3-pre-commit-and-pre-merge-commit-hooks.sh | 38 ---
1 file changed, 24 insertions(+), 14 deleti
With a failing automatic merge, we want to make sure that we *don't*
call the pre-merge-commit hook and that we (eventually) *do* call the
pre-commit hook.
Signed-off-by: Martin Ågren
---
...3-pre-commit-and-pre-merge-commit-hooks.sh | 30 +++
1 file changed, 30 inser
On Fri, 2 Aug 2019 at 00:20, Josh Steadmon wrote:
> diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
> index 82cd573776..7c4c994858 100644
> --- a/Documentation/githooks.txt
> +++ b/Documentation/githooks.txt
> @@ -103,6 +103,13 @@ The default 'pre-commit' hook, when enabled--
On Thu, 1 Aug 2019 at 17:57, Junio C Hamano wrote:
>
> Martin Ågren writes:
>
> > Fix the spelling of the new "--no-show-forced-updates" option that "git
> > fetch/pull" learned. Similarly, spell "--function-context" correctly and
> > fi
Fix the spelling of the new "--no-show-forced-updates" option that "git
fetch/pull" learned. Similarly, spell "--function-context" correctly and
fix a few typos, grammos and minor mistakes.
One of these is also in 2.22.1.txt, so fix it there too.
Signed-off-by: Ma
On Tue, 30 Jul 2019 at 01:43, Josh Steadmon wrote:
>
> On 2019.07.29 22:04, Martin Ågren wrote:
> > This script seems to me like if it passes 100%, we can be fairly sure
> > we're ok, but [...]
> Will squash these as you said in V3. Will also think about whether
>
On Fri, 19 Jul 2019 at 01:56, Josh Steadmon wrote:
> This series revives an old suggestion [...] to make merge honor
> pre-commit hook or a separate pre-merge hook. Since pre-commit does not
> receive any arguments (which the hook could use tell between commit and
> merge) and in order to keep exi
On Fri, 19 Jul 2019 at 01:56, Josh Steadmon wrote:
> * Martin's objection on 1/4 that the sample hook would always exit
> successfully is (I believe) incorrect. To test this, I ran
> "/bin/true && exec test 0 == 1" in a /bin/sh subshell, and it
> correctly had a non-zero exit status.
I retr
On Fri, 19 Jul 2019 at 00:57, Josh Steadmon wrote:
> +test_expect_success '--no-verify with succeeding hook (merge)' '
> +
> + git checkout side &&
> + git merge --no-verify -m "merge master" master &&
> + git checkout master
> +
> +'
This test doesn't even try to verify that th
On Fri, 19 Jul 2019 at 00:57, Josh Steadmon wrote:
> From: Michael J Gruber
>
> Analogous to commit, introduce a '--no-verify' option which bypasses the
> pre-merge hook. The shorthand '-n' is taken by the (non-existing)
> '--no-stat' already.
I don't understand this "(non-existing)". I realize
On Fri, 19 Jul 2019 at 00:57, Josh Steadmon wrote:
> --- /dev/null
> +++ b/templates/hooks--pre-merge.sample
> @@ -0,0 +1,13 @@
> +#!/bin/sh
> +#
> +# An example hook script to verify what is about to be committed.
> +# Called by "git merge" with no arguments. The hook should
> +# exit with non-z
On Fri, 12 Jul 2019 at 00:16, brian m. carlson
wrote:
>
> On 2019-07-11 at 21:36:50, Michael Kielstra wrote:
> > Hi all,
> >
> > I noticed that git pull reports "Already up to date." but git push
> > reports "Everything up-to-date". (I'm using git 2.20.1, the latest in
> > the Ubuntu repos.) Jus
On Thu, 11 Jul 2019 at 20:39, Ariadne Conill wrote:
>
> In order to prove that the --no-use-mailmap option works as expected,
> we add a test for it which runs with -c log.mailmap=true to ensure that
> the option successfully negates the configured default.
I believe that testing with `-c log.mai
Hi Ariadne,
Welcome to the list!
On Thu, 11 Jul 2019 at 18:39, Ariadne Conill wrote:
>
> Hello,
>
> On Thu, Jul 11, 2019 at 10:19 AM brian m. carlson
> wrote:
> >
> > On 2019-07-11 at 08:19:58, Ariadne Conill wrote:
> > > The `git log` command shows the author and committer name recorded in
> >
we need to be careful not
to zero `used_atom_cnt` until after we've called `free_array_item()`. We
could move just a single line, but let's keep related things close
together instead, by first handling `array`, then `used_atom`.
Signed-off-by: Martin Ågren
---
ref-filter.c | 14 +++
On Tue, 25 Jun 2019 at 13:40, Johannes Schindelin
wrote:
> On Tue, 25 Jun 2019, Martin Ågren wrote:
> > Do you have any suggestions as to how this could be made clearer?
> > There are at least two of us that have stumbled on this. :-)
>
> Make that three.
>
Hi Catalin
Welcome to the list!
On Tue, 25 Jun 2019 at 09:43, Catalin Criste wrote:
> @@ -88,7 +88,7 @@ save [-p|--patch] [-k|--[no-]keep-index]
> [-u|--include-untracked] [-a|--all] [-q
>
> This option is deprecated in favour of 'git stash push'. It
> differs from "stash push
On Thu, 13 Jun 2019 at 23:33, René Scharfe wrote:
>
> Am 13.06.19 um 21:42 schrieb Martin Ågren:
> > On Thu, 13 Jun 2019 at 19:54, René Scharfe wrote:
> >> Make sure the intermediate value stays within the boundaries instead,
> >> like this:
> >>
> >
On Thu, 13 Jun 2019 at 19:54, René Scharfe wrote:
>
> Calculating the sum of two array indexes to find the midpoint between
> them can overflow, i.e. code like this is unsafe for big arrays:
>
> mid = (first + last) >> 1;
>
> Make sure the intermediate value stays within the boundaries ins
Hi Rohit,
On Thu, 13 Jun 2019 at 19:46, Phillip Wood wrote:
>
> On 13/06/2019 05:05, Rohit Ashiwal wrote:
> > -static int create_seq_dir(void)
> > +static int create_seq_dir(struct repository *r)
> > {
> > - if (file_exists(git_path_seq_dir())) {
> > - error(_("a cherry-pick or r
Hi Dscho,
On Sat, 8 Jun 2019 at 16:45, Johannes Schindelin via GitGitGadget
wrote:
>
> From: Johannes Schindelin
>
> On a case-insensitive filesystem, such as HFS+ or NTFS, it is possible
> that the idea Bash has of the current directory differs in case from
> what Git thinks it is. That's total
On Sat, 6 Apr 2019 at 00:51, Todd Zullinger wrote:
>
> The second paragraph in the CONFIGURATION section intends to emphasize
> the word 'must' with bold type. Adjust the formatting slightly to
> provide similar results between asciidoc and asciidoctor.
I don't think this explains the problem yo
On Sat, 6 Apr 2019 at 00:51, Todd Zullinger wrote:
>
> The {apostrophe} was needed at the time of a521845800 ("Documentation:
> remove stray backslash in show-branch discussion", 2010-08-20). All
> other uses of {apostrophe} were removed in 6cf378f0cb ("docs: stop using
> asciidoc no-inline-liter
On Sat, 6 Apr 2019 at 00:51, Todd Zullinger wrote:
> Here's what I have currently. I haven't tested this much with
> asciidoctor-1.5.x releases (or maybe not at all -- it's been a
> week or so since I worked on this).
Tested with Asciidoctor 1.5.5. For both patches, AsciiDoctor stumbles
before t
Hi Todd,
On Fri, 5 Apr 2019 at 03:40, Todd Zullinger wrote:
> > On Sat, 30 Mar 2019 at 19:30, Todd Zullinger wrote:
> >>
> >> Just chipping away at the remaining differences between asciidoc and
> >> asciidoctor.
> >>
> >> Todd Zullinger (2):
> >> Documentation/rev-list-options: wrap --date=
Hi Junio
On Fri, 29 Mar 2019 at 20:52, SZEDER Gábor wrote:
>
> On Fri, Mar 29, 2019 at 01:35:19PM +0100, SZEDER Gábor wrote:
> > The release of Asciidoctor v2.0.0 two days ago broke our documentation
>
> Well, what happened "two days ago" when I sent v2 is now seven days
> ago... Let's just say
On Sat, 30 Mar 2019 at 19:30, Todd Zullinger wrote:
>
> Just chipping away at the remaining differences between asciidoc and
> asciidoctor.
>
> Todd Zullinger (2):
> Documentation/rev-list-options: wrap --date= block with "--"
> Documentation/git-status: fix titles in porcelain v2 section
Nic
On Wed, 20 Mar 2019 at 19:17, Todd Zullinger wrote:
> Martin Ågren wrote:
> > {litdd} now renders as --. We should find some other way to
> > produce '--'. This should then be a simple change, as we're already
> > providing this attribute inside an `ifdef USE_
On Wed, 20 Mar 2019 at 12:50, Nguyễn Thái Ngọc Duy wrote:
> + OPT_CALLBACK_F(0, "no-prefix", options, NULL,
> + N_("no not show any source or destination
> prefix"),
> + PARSE_OPT_NONEG | PARSE_OPT_NOARG,
> diff_opt_no_prefi
On Wed, 20 Mar 2019 at 12:48, Nguyễn Thái Ngọc Duy wrote:
> + OPT_FILENAME('O', NULL, &options->orderfile,
> +N_("override diff.orderFile configuration
> variable")),
This doesn't really tell me *why* I would want to provide -O. Or put
another way, there
On Wed, 20 Mar 2019 at 12:59, Nguyễn Thái Ngọc Duy wrote:
>
> mark one more string for translation while at there.
s/^m/M/
> + OPT_CALLBACK_F(0, "ws-error-highlight", options, N_(""),
> + N_("highlight whitespaces errors in the
> context, old or new li
On Tue, 19 Mar 2019 at 04:14, Jeff King wrote:
>
> On Sun, Mar 17, 2019 at 07:35:59PM +0100, Martin Ågren wrote:
>
> > I've taught `doc-diff` a few new knobs to support usage like
> >
> > $ ./doc-diff --from-asciidoc --to-asciidoctor HEAD HEAD
>
> Very
On Wed, 20 Mar 2019 at 09:17, Jeff King wrote:
> - since this was cut-and-pasted to four different spots, let's define
> a single OPT_REF_SORT() macro that we can use everywhere
Indeed, all four are identical. And FWIW I failed to find a fifth caller
anywhere (I looked for "OPT_CALLBACK.*so
Hi Junio
On Tue, 19 Mar 2019 at 08:33, Martin Ågren wrote:
> between asciidoc and asciidoctor considerably. Let's assume for the
> moment that these patches or something like them enter master...
To be clear. *This* patch has a sufficiently incorrect commit message
that it rea
On Tue, 19 Mar 2019 at 04:55, Junio C Hamano wrote:
>
> Jeff King writes:
>
> > So in my mind, the endgame is that we eventually drop asciidoc in favor
> > of asciidoctor. The repo at:
> >
> > https://github.com/asciidoc/asciidoc
> >
> > says:
> >
> > NOTE: This implementation is written in P
On Tue, 19 Mar 2019 at 04:30, Jeff King wrote:
>
> On Mon, Mar 18, 2019 at 10:46:45PM -0400, Jeff King wrote:
>
> > It does seem like "mansource" is the way asciidoctor expects us to do
> > this. Why doesn't it work from the command line? Is it a bug in
> > asciidoctor, or is there something more
On Tue, 19 Mar 2019 at 03:46, Jeff King wrote:
>
> On Sun, Mar 17, 2019 at 03:47:47PM +0100, Martin Ågren wrote:
>
> > Cc Todd and Peff who had a brief exchange [1] a while ago. Apparently
> > Todd saw this "[FIXME: source]" on Fedora but Peff did not on Debia
On Sun, 17 Mar 2019 at 20:44, Todd Zullinger wrote:
> Martin Ågren wrote:
> > * Provide the `mansource` attribute to Asciidoctor. This attribute
> > looks promising until one realizes that it can only be given inside
> > the source file (the .txt file in our case),
Hi Todd,
On Sun, 17 Mar 2019 at 20:44, Todd Zullinger wrote:
>
> Hi Martin,
>
> Martin Ågren wrote:
> > That is, we miss out on the `` tags. As a result, the
> > header of each man page doesn't say "Git Manual", but "git-foo(1)"
> > instea
On Sun, 17 Mar 2019 at 13:50, Nguyễn Thái Ngọc Duy wrote:
>
> 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 a missing possessive apostrophe after the word
> "submodules" whil
On Sun, 17 Mar 2019 at 13:49, Nguyễn Thái Ngọc Duy wrote:
>
> I added this option in git-checkout and git-merge in c1d7036b6b
> (checkout,merge: disallow overwriting ignored files with
> --no-overwrite-ignore - 2011-11-27) but did not remember to update
> documentation. This completes that commit.
ing in the documentation build, similar to how
the main Makefile tracks CFLAGS and prefix flags. Track ASCIIDOC_COMMON
directly rather than its individual components -- that should make it
harder to forget to update the tracking if/when we modify the build
commands.
Signed-off-by: Martin Ågren
---
Doc
y names of our "installed" and
"rendered" files, so that we can run `./doc-diff --from-asciidoc
--to-asciidoctor HEAD HEAD` without our two runs stomping on each other.
Signed-off-by: Martin Ågren
---
Documentation/doc-diff | 53 +++---
x27;t be able
to trust that what we use out of that cache actually corresponds to the
options given for this run. (We could optimize this caching a little
since this flag doesn't affect the contents of "installed" at all, but
let's punt on that.)
Signed-off-by: Martin Ågren
---
arguments instead.
Signed-off-by: Martin Ågren
---
Documentation/doc-diff | 28 +---
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/Documentation/doc-diff b/Documentation/doc-diff
index 32c83dd26f..3e975d3c5d 100755
--- a/Documentation/doc-diff
+++ b
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
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
---
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
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
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
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
1 - 100 of 749 matches
Mail list logo
