aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2024-04-19 22:39:20 +0200
committerChristian Hesse <mail@eworm.de>2024-04-29 21:13:53 +0200
commitdbadd856ba0537110338cfe58256b152d01388c0 (patch)
tree3d95e482d7372e8571446d6b286ad12fe4197fc7
parent8905003cba637e5b18069e625cd4f4c05ac30251 (diff)
downloadcgit-origin/ch/for-jason.tar.gz
cgit-origin/ch/for-jason.tar.xz
git: update to v2.45.0origin/ch/for-jason
Update to git version v2.45.0, this requires changes for these upstream commits: * 9720d23e8caf4adee44b3a32803a9bb0480118bd date: make DATE_MODE thread-safe Signed-off-by: Christian Hesse <mail@eworm.de>
-rw-r--r--Makefile2
m---------git0
-rw-r--r--ui-shared.c4
-rw-r--r--ui-shared.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index c3ee267..2612a75 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
pdfdir = $(docdir)
mandir = $(prefix)/share/man
SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.44.0
+GIT_VER = 2.45.0
GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
INSTALL = install
COPYTREE = cp -r
diff --git a/git b/git
-Subproject 3c2a3fdc388747b9eaf4a4a4f2035c1c9ddb26d
+Subproject 786a3e4b8d754d2b14b1208b98eeb0a554ef19a
diff --git a/ui-shared.c b/ui-shared.c
index eef2aa8..d5b5b20 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -662,12 +662,12 @@ void cgit_submodule_link(const char *class, char *path, const char *rev)
path[len - 1] = tail;
}
-const struct date_mode *cgit_date_mode(enum date_mode_type type)
+const struct date_mode cgit_date_mode(enum date_mode_type type)
{
static struct date_mode mode;
mode.type = type;
mode.local = ctx.cfg.local_time;
- return &mode;
+ return mode;
}
static void print_rel_date(time_t t, int tz, double value,
diff --git a/ui-shared.h b/ui-shared.h
index 6964873..f12fa99 100644
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -65,7 +65,7 @@ __attribute__((format (printf,1,2)))
extern void cgit_print_error(const char *fmt, ...);
__attribute__((format (printf,1,0)))
extern void cgit_vprint_error(const char *fmt, va_list ap);
-extern const struct date_mode *cgit_date_mode(enum date_mode_type type);
+extern const struct date_mode cgit_date_mode(enum date_mode_type type);
extern void cgit_print_age(time_t t, int tz, time_t max_relative);
extern void cgit_print_http_headers(void);
extern void cgit_redirect(const char *url, bool permanent);