List for cgit developers and users
 help / color / mirror / Atom feed
From: actionmystique at gmail.com (jean-christophe manciot)
Subject: [PATCH v2] Make default pages configurable
Date: Tue, 20 Aug 2019 11:09:46 +0200	[thread overview]
Message-ID: <CAKcFC3YFdEotBkCmLZFNEVZz56kiUaN8V1HREORRN2FO=wWcXw@mail.gmail.com> (raw)
In-Reply-To: <CAHEx5uu-epvH+TcOyreDxb95qKCctwGRG7wkWVe657by8winAQ@mail.gmail.com>

>
> Sorry, that's on your end. If you're using the Gmail web interface,
> make sure to click "Show original" before you copy-and-paste, as Gmail
> tends to add buttons and mangle messages in various ways.
>

   -  "Show original" displays an encrypted message
   - the patch from a non-gmail source
   <https://www.mail-archive.com/cgit at lists.zx2c4.com/msg02904.html> after
   removing the non-original added new lines (as *attached below*) raises
   multiple issues, maybe because all tabulations have been replaced by
   spaces:

*git checkout -f v1.2.1-24-ge1ad15d*
*git apply --verbose ../default-pages.patch*
Checking patch cgit.c...
error: while searching for:
               repo->homepage = xstrdup(value);
       else if (!strcmp(name, "defbranch"))
               repo->defbranch = xstrdup(value);
       else if (!strcmp(name, "extra-head-content"))
               repo->extra_head_content = xstrdup(value);
       else if (!strcmp(name, "snapshots"))

error: patch failed: cgit.c:46
error: cgit.c: patch does not apply
Checking patch cgit.h...
error: while searching for:
       char *owner;
       char *homepage;
       char *defbranch;
       char *module_link;
       struct string_list readme;
       char *section;

error: patch failed: cgit.h:86
error: cgit.h: patch does not apply
Checking patch cgitrc.5.txt...
error: while searching for:
       Url which specifies the css document to include in all cgit pages.
       Default value: "/cgit.css".

email-filter::
       Specifies a command which will be invoked to format names and email
       address of committers, authors, and taggers, as represented in
various

error: patch failed: cgitrc.5.txt:128
error: cgitrc.5.txt: patch does not apply
Checking patch cmd.c...
error: while searching for:
                       free(redirect);
               } else if (ctx.repo->readme.nr)
                       cgit_print_repo_readme(ctx.qry.path);
               else if (ctx.repo->homepage)
                       cgit_redirect(ctx.repo->homepage, false);
               else {
                       char *currenturl = cgit_currenturl();
                       char *redirect = fmtalloc("%s../", currenturl);
                       cgit_redirect(redirect, false);
                       free(currenturl);
                       free(redirect);
               }
       } else

error: patch failed: cmd.c:51
error: cmd.c: patch does not apply
Checking patch ui-repolist.c...
error: while searching for:
               }
               htmlf("<tr><td class='%s'>",
                     !sorted && section ? "sublevel-repo" :
"toplevel-repo");
               cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL,
NULL);
               html("</td><td>");
               repourl = cgit_repourl(ctx.repo->url);
               html_link_open(repourl, NULL, NULL);

error: patch failed: ui-repolist.c:321
error: ui-repolist.c: patch does not apply
Checking patch ui-shared.c...
error: while searching for:
       html("</a>");
}

void cgit_summary_link(const char *name, const char *title, const char
*class,
                      const char *head)
{
       reporevlink(NULL, name, title, class, head, NULL, NULL);
}

void cgit_tag_link(const char *name, const char *title, const char *class,

error: patch failed: ui-shared.c:327
error: ui-shared.c: patch does not apply
Checking patch ui-shared.h...
error: while searching for:

extern void cgit_index_link(const char *name, const char *title,
                           const char *class, const char *pattern, const
char *sort, int ofs, int always_root);
extern void cgit_summary_link(const char *name, const char *title,
                             const char *class, const char *head);
extern void cgit_tag_link(const char *name, const char *title,

error: patch failed: ui-shared.h:17
error: ui-shared.h: patch does not apply

Could you attach the correct patch in your answer that we could apply to
the latest master commit?

--
Jean-Christophe
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20190820/819ce838/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: default-pages.patch
Type: text/x-patch
Size: 9941 bytes
Desc: not available
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20190820/819ce838/attachment.bin>


  reply	other threads:[~2019-08-20  9:09 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-13 17:22 [PATCH] " 
2019-08-15 10:26 ` john
2019-08-15 10:56   ` 
2019-08-15 12:50   ` [PATCH v2] " 
2019-08-19  8:31     ` actionmystique
2019-08-19  9:44       ` 
2019-08-20  9:09         ` actionmystique [this message]
2019-08-20 11:28           ` 
2019-08-21 14:50             ` actionmystique

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='CAKcFC3YFdEotBkCmLZFNEVZz56kiUaN8V1HREORRN2FO=wWcXw@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).