From: actionmystique at gmail.com (jean-christophe manciot)
Subject: Cannot apply about patches anymore
Date: Wed, 26 Jun 2019 10:16:38 +0200 [thread overview]
Message-ID: <CAKcFC3a=XjJ4XzKMEjBy3MWgHcAX5Upiyowo-VbVSQGDvXB7OQ@mail.gmail.com> (raw)
Hi there,
It used to be possible to apply the attached patches to get the about link
when opening a file:
[image: about link.png]
Since commit e1ad15d368bdeb1bffea588b93a29055c5dfb7f4, it is not possible
anymore:
git apply --verbose ../about-link-1.patch
*Checking patch ui-shared.c...Checking patch ui-shared.h...Checking patch
ui-tree.c...error: while searching for: cgit_print_layout_start();
htmlf("blob: %s (", oid_to_hex(oid)); cgit_plain_link("plain", NULL, NULL,
ctx.qry.head, rev, path); if (ctx.cfg.enable_blame) {error: patch
failed: ui-tree.c:108error: ui-tree.c: patch does not apply*
BTW, why haven't those patches been committed to the master branch? They
are quite old and work fine.
--
Jean-Christophe
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20190626/8d1c4e26/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: about link.png
Type: image/png
Size: 26889 bytes
Desc: not available
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20190626/8d1c4e26/attachment-0001.png>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: about-link-1.patch
Type: text/x-patch
Size: 1837 bytes
Desc: not available
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20190626/8d1c4e26/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: about-link-2.patch
Type: text/x-patch
Size: 647 bytes
Desc: not available
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20190626/8d1c4e26/attachment-0003.bin>
next reply other threads:[~2019-06-26 8:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-26 8:16 actionmystique [this message]
2019-06-26 8:37 ` Jason
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAKcFC3a=XjJ4XzKMEjBy3MWgHcAX5Upiyowo-VbVSQGDvXB7OQ@mail.gmail.com' \
--to=cgit@lists.zx2c4.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.
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 NNTP newsgroup(s).