* [PATCH 1/1] RFC: git: update to v2.45.0-rc0
@ 2024-04-19 20:47 Christian Hesse
2024-04-24 20:36 ` [PATCH 1/1] RFC: git: update to v2.45.0-rc1 Christian Hesse
0 siblings, 1 reply; 2+ messages in thread
From: Christian Hesse @ 2024-04-19 20:47 UTC (permalink / raw)
To: cgit; +Cc: Christian Hesse
From: Christian Hesse <mail@eworm.de>
Update to git version v2.45.0-rc0, this requires changes for these
upstream commits:
* 9720d23e8caf4adee44b3a32803a9bb0480118bd
date: make DATE_MODE thread-safe
Signed-off-by: Christian Hesse <mail@eworm.de>
---
Makefile | 4 ++--
git | 2 +-
ui-shared.c | 4 ++--
ui-shared.h | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index c3ee267..d3bcc0b 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@ htmldir = $(docdir)
pdfdir = $(docdir)
mandir = $(prefix)/share/man
SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.44.0
-GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
+GIT_VER = 2.45.0.rc0
+GIT_URL = https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.xz
INSTALL = install
COPYTREE = cp -r
MAN5_TXT = $(wildcard *.5.txt)
diff --git a/git b/git
index 3c2a3fd..ae3196a 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 3c2a3fdc388747b9eaf4a4a4f2035c1c9ddb26d0
+Subproject commit ae3196a5ea84a9e88991d576020cf66512487088
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);
--
2.44.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 1/1] RFC: git: update to v2.45.0-rc1
2024-04-19 20:47 [PATCH 1/1] RFC: git: update to v2.45.0-rc0 Christian Hesse
@ 2024-04-24 20:36 ` Christian Hesse
0 siblings, 0 replies; 2+ messages in thread
From: Christian Hesse @ 2024-04-24 20:36 UTC (permalink / raw)
To: cgit; +Cc: Christian Hesse
From: Christian Hesse <mail@eworm.de>
Update to git version v2.45.0-rc1, this requires changes for these
upstream commits:
* 9720d23e8caf4adee44b3a32803a9bb0480118bd
date: make DATE_MODE thread-safe
Signed-off-by: Christian Hesse <mail@eworm.de>
---
Makefile | 4 ++--
git | 2 +-
ui-shared.c | 4 ++--
ui-shared.h | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index c3ee267..0654f70 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@ htmldir = $(docdir)
pdfdir = $(docdir)
mandir = $(prefix)/share/man
SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.44.0
-GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
+GIT_VER = 2.45.0.rc1
+GIT_URL = https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.xz
INSTALL = install
COPYTREE = cp -r
MAN5_TXT = $(wildcard *.5.txt)
diff --git a/git b/git
index 3c2a3fd..bf995e7 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 3c2a3fdc388747b9eaf4a4a4f2035c1c9ddb26d0
+Subproject commit bf995e7a4f94a9388aa8042dc9e338f3fcb75496
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);
--
2.44.0
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-04-24 20:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-19 20:47 [PATCH 1/1] RFC: git: update to v2.45.0-rc0 Christian Hesse
2024-04-24 20:36 ` [PATCH 1/1] RFC: git: update to v2.45.0-rc1 Christian Hesse
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).