diff options
| author |   Robby Workman <rworkman@slackbuilds.org> | 2017-08-24 19:22:28 -0500 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2017-08-26 07:20:38 +0700 |
| commit | 4174da45a36fdf2f65914f22865dcc48433554c2 (patch) | |
| tree | 14e161231bc5a8675857dbd5e124af8cc5864659 /development/cgit/patches/0015-ui-plain-print-symlink-content.patch | |
| parent | df75f0401ee693208abfaf397f480ae1f61862d1 (diff) | |
| download | slackbuilds-4174da45a36fdf2f65914f22865dcc48433554c2.tar.gz slackbuilds-4174da45a36fdf2f65914f22865dcc48433554c2.tar.xz | |
development/cgit: Include some upstream git patches
Some general bugfixes, but more importantly, patch 0005 fixes
a segfault in git's pathspec.c that we were seeing on the
SBo git server.
Thanks to John Keeping (cgit contributor) for helping with
debug suggestions and identifying the specific commit we
needed to fix it.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'development/cgit/patches/0015-ui-plain-print-symlink-content.patch')
| -rw-r--r-- | development/cgit/patches/0015-ui-plain-print-symlink-content.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/development/cgit/patches/0015-ui-plain-print-symlink-content.patch b/development/cgit/patches/0015-ui-plain-print-symlink-content.patch new file mode 100644 index 0000000000..736158bc3b --- /dev/null +++ b/development/cgit/patches/0015-ui-plain-print-symlink-content.patch @@ -0,0 +1,30 @@ +From 51cc456b773a3bb7253fad2146c1a0d2b0fa98cb Mon Sep 17 00:00:00 2001 +From: John Keeping <john@keeping.me.uk> +Date: Mon, 6 Mar 2017 23:27:23 +0000 +Subject: [PATCH 15/15] ui-plain: print symlink content + +We currently ignore symlinks in ui-plain, leading to a 404. In ui-tree +we print the content of the blob (that is, the path to the target of the +link), so it makes sense to do the same here. + +Signed-off-by: John Keeping <john@keeping.me.uk> +--- + ui-plain.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ui-plain.c b/ui-plain.c +index e45d553..cfdbf73 100644 +--- a/ui-plain.c ++++ b/ui-plain.c +@@ -135,7 +135,7 @@ static int walk_tree(const unsigned char *sha1, struct strbuf *base, + struct walk_tree_context *walk_tree_ctx = cbdata; + + if (base->len == walk_tree_ctx->match_baselen) { +- if (S_ISREG(mode)) { ++ if (S_ISREG(mode) || S_ISLNK(mode)) { + if (print_object(sha1, pathname)) + walk_tree_ctx->match = 1; + } else if (S_ISDIR(mode)) { +-- +2.14.1 + |