From: Jeff King <peff@peff.net>
To: "Martin Ågren" <martin.agren@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] config.txt: move closing "----" to cover entire listing
Date: Thu, 9 Apr 2020 11:51:59 -0400 [thread overview]
Message-ID: <20200409155159.GA4129050@coredump.intra.peff.net> (raw)
In-Reply-To: <CAN0heSp3=8fTGb5Ciuvr8+EevNSrAfskvrrS_PN=VPhKJyB5jA@mail.gmail.com>
On Thu, Apr 09, 2020 at 05:00:34PM +0200, Martin Ågren wrote:
> > That explains why I didn't see the issue when running doc-diff on the
> > original bug. I wonder if we could teach doc-diff to look at the HTML,
> > too. I'm not sure how, though. Certainly html2text or similar would get
> > us something diff-able, but without the visual elements (like the grey
> > box), I don't know that it's much more valuable than the manpages.
>
> At one point I considered trying out diffoscope for this. It should
> allegedly be good at comparing "everything". But being good at
> everything, it wanted to pull in a discouragingly large number of
> dependencies, so I never actually tried it out. It doesn't explicitly
> claim to know html or manpages (but does mention xml and pdf), so I
> dunno.
I tried it just now, and it's not that clever. A regular "diff -r" of
the before and after HTML yields what you'd expect:
--- old/git-config.html 2020-04-09 11:38:19.312436125 -0400
+++ new/git-config.html 2020-04-09 11:38:40.028385850 -0400
@@ -1678,11 +1678,9 @@
; file (if the condition is true); their location is not
; affected by the condition
[includeIf "gitdir:/path/to/group/"]
- path = foo.inc</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>; include only if we are in a worktree where foo-branch is
+ path = foo.inc
+
+; include only if we are in a worktree where foo-branch is
; currently checked out
[includeIf "onbranch:foo-branch"]
path = foo.inc</code></pre>
A diffoscope diff yields the same, plus it complains about differing
timestamps on all of the files. I don't think it's doing anything clever
with respect to HTML formatting.
-Peff
next prev parent reply other threads:[~2020-04-09 15:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-09 10:35 [PATCH] config.txt: move closing "----" to cover entire listing Martin Ågren
2020-04-09 14:14 ` Jeff King
2020-04-09 15:00 ` Martin Ågren
2020-04-09 15:51 ` Jeff King [this message]
2020-04-10 7:09 ` Martin Ågren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200409155159.GA4129050@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=martin.agren@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).