From mboxrd@z Thu Jan  1 00:00:00 1970
From: list at eworm.de (Christian Hesse)
Date: Thu, 24 Oct 2019 08:38:20 +0200
Subject: [PATCH v2 1/2] git: update to v2.22.0
In-Reply-To: <20191023211759.87807-1-list@eworm.de>
References: <20191023211759.87807-1-list@eworm.de>
Message-ID: <20191024063820.4357-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