crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git: update to v2.22.0

Browse Source 
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@eworm.de>
This commit is contained in:
Christian Hesse 2019-05-13 21:41:37 +02:00
parent e1ad15d368
commit 034e3c7d56
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -14,7 +14,7 @@ htmldir = $(docdir)
pdfdir = $(docdir) pdfdir = $(docdir)
mandir = $(prefix)/share/man mandir = $(prefix)/share/man
SHA1_HEADER = <openssl/sha.h> 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 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
INSTALL = install INSTALL = install
COPYTREE = cp -r COPYTREE = cp -r

17
cgit.c
View File

@ -19,6 +19,16 @@
const char *cgit_version = CGIT_VERSION; const char *cgit_version = CGIT_VERSION;
__attribute__((constructor))
static void constructor_environment()
{
/* 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");
}
static void add_mimetype(const char *name, const char *value) static void add_mimetype(const char *name, const char *value)
{ {
struct string_list_item *item; struct string_list_item *item;
@ -565,18 +575,13 @@ static void prepare_repo_env(int *nongit)
/* The path to the git repository. */ /* The path to the git repository. */
setenv("GIT_DIR", ctx.repo->path, 1); setenv("GIT_DIR", ctx.repo->path, 1);
/* 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 /* 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 * load local configuration from the git repository, so we do them both while
* the HOME variables are unset. */ * the HOME variables are unset. */
setup_git_directory_gently(nongit); setup_git_directory_gently(nongit);
init_display_notes(NULL); init_display_notes(NULL);
} }
static int prepare_repo_cmd(int nongit) static int prepare_repo_cmd(int nongit)
{ {
struct object_id oid; struct object_id oid;

2
git

@ -1 +1 @@
Subproject commit 8104ec994ea3849a968b4667d072fedd1e688642 Subproject commit b697d92f56511e804b8ba20ccbe7bdc85dc66810