From: list at eworm.de (Christian Hesse)
Subject: [PATCH v2 1/2] git: update to v2.22.0
Date: Thu, 24 Oct 2019 08:38:20 +0200 [thread overview]
Message-ID: <20191024063820.4357-1-list@eworm.de> (raw)
In-Reply-To: <20191023211759.87807-1-list@eworm.de>
From: Christian Hesse <mail at eworm.de>
Update to git version v2.22.0.
Upstream commit bce9db6d ("trace2: use system/global config for default
trace2 settings") caused a regression. Due to early loading of config
unsetting HOME and XDG_CONFIG_HOME is too late.
Do not link common-main.o but build a private copy without trace2_*()
function calls.
Signed-off-by: Christian Hesse <mail at eworm.de>
---
.gitignore | 1 +
Makefile | 2 +-
cgit.mk | 6 +++++-
git | 2 +-
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index 661df34..3832e0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
# Files I don't care to see in git-status/commit
/cgit
cgit.conf
+cgit-main.c
CGIT-CFLAGS
VERSION
cgitrc.5
diff --git a/Makefile b/Makefile
index 40f4fd8..b2bd351 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.21.0
+GIT_VER = 2.22.0
GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
INSTALL = install
COPYTREE = cp -r
diff --git a/cgit.mk b/cgit.mk
index 3fcc1ca..76f1430 100644
--- a/cgit.mk
+++ b/cgit.mk
@@ -68,6 +68,7 @@ ifdef HAVE_LINUX_SENDFILE
endif
CGIT_OBJ_NAMES += cgit.o
+CGIT_OBJ_NAMES += cgit-main.o
CGIT_OBJ_NAMES += cache.o
CGIT_OBJ_NAMES += cmd.o
CGIT_OBJ_NAMES += configfile.o
@@ -126,10 +127,13 @@ $(CGIT_PREFIX)CGIT-CFLAGS: FORCE
echo "$$FLAGS" >$(CGIT_PREFIX)CGIT-CFLAGS; \
fi
+$(CGIT_PREFIX)cgit-main.c: common-main.c
+ sed -e '/trace2/s|^|//|' -e '/^#include/s|"|"git/|' > $@ < $<
+
$(CGIT_OBJS): %.o: %.c GIT-CFLAGS $(CGIT_PREFIX)CGIT-CFLAGS $(missing_dep_dirs)
$(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $(CGIT_CFLAGS) $<
-$(CGIT_PREFIX)cgit: $(CGIT_OBJS) GIT-LDFLAGS $(GITLIBS)
+$(CGIT_PREFIX)cgit: $(CGIT_OBJS) GIT-LDFLAGS $(filter-out common-main.o,$(GITLIBS))
@echo 1>&1 " * $(LUA_MESSAGE)"
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) $(CGIT_LIBS)
diff --git a/git b/git
index 8104ec9..b697d92 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 8104ec994ea3849a968b4667d072fedd1e688642
+Subproject commit b697d92f56511e804b8ba20ccbe7bdc85dc66810
next prev parent reply other threads:[~2019-10-24 6:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-23 21:17 [PATCH " list
2019-10-23 21:17 ` [PATCH 2/2] git: update to v2.23.0 list
2019-10-24 6:38 ` list [this message]
2019-10-24 8:17 ` [PATCH v3 1/2] git: update to v2.22.0 list
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=20191024063820.4357-1-list@eworm.de \
--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).