From: list at eworm.de (Christian Hesse)
Subject: [PATCH v3 1/2] git: update to v2.22.0
Date: Thu, 24 Oct 2019 10:17:22 +0200 [thread overview]
Message-ID: <20191024081722.54789-1-list@eworm.de> (raw)
In-Reply-To: <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. We have to unset HOME and
XDG_CONFIG_HOME before early loading of config from trace2 code kicks in.
Signed-off-by: Christian Hesse <mail at eworm.de>
---
Makefile | 2 +-
cgit.c | 9 +++++++--
git | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
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.c b/cgit.c
index 2910d4b..3b71faf 100644
--- a/cgit.c
+++ b/cgit.c
@@ -19,6 +19,12 @@
const char *cgit_version = CGIT_VERSION;
+__attribute__((constructor))
+static void constructor_unsetenv() {
+ unsetenv("HOME");
+ unsetenv("XDG_CONFIG_HOME");
+}
+
static void add_mimetype(const char *name, const char *value)
{
struct string_list_item *item;
@@ -568,8 +574,6 @@ static void prepare_repo_env(int *nongit)
/* Do not look in /etc/ for gitconfig and gitattributes. */
setenv("GIT_CONFIG_NOSYSTEM", "1", 1);
setenv("GIT_ATTR_NOSYSTEM", "1", 1);
- unsetenv("HOME");
- unsetenv("XDG_CONFIG_HOME");
/* Setup the git directory and initialize the notes system. Both of these
* load local configuration from the git repository, so we do them both while
@@ -577,6 +581,7 @@ static void prepare_repo_env(int *nongit)
setup_git_directory_gently(nongit);
init_display_notes(NULL);
}
+
static int prepare_repo_cmd(int nongit)
{
struct object_id oid;
diff --git a/git b/git
index 8104ec9..b697d92 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 8104ec994ea3849a968b4667d072fedd1e688642
+Subproject commit b697d92f56511e804b8ba20ccbe7bdc85dc66810
prev parent reply other threads:[~2019-10-24 8:17 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 ` [PATCH v2 1/2] git: update to v2.22.0 list
2019-10-24 8:17 ` list [this message]
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=20191024081722.54789-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).