mirror of
https://git.zx2c4.com/cgit
synced 2024-11-09 10:08:42 +00:00
git: update to v2.42.0
Update to git version v2.42.0, this requires changes for these upstream commits: * bc5c5ec0446895f5c4139cd470066beb3c4ac6d5 cache.h: remove this no-longer-used header * aba070683295a20bdf4f49146384984961c794b2 path: move related function to path * a4e7e317f8f27f861321e6eb08b9c8c0f3ab570c config: add ctx arg to config_fn_t Signed-off-by: Christian Hesse <mail@eworm.de>
This commit is contained in:
parent
a6da40bf84
commit
2f50b47c72
2
Makefile
2
Makefile
@ -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.41.0
|
GIT_VER = 2.42.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
|
||||||
|
2
cgit.h
2
cgit.h
@ -6,7 +6,6 @@
|
|||||||
#include <git-compat-util.h>
|
#include <git-compat-util.h>
|
||||||
|
|
||||||
#include <archive.h>
|
#include <archive.h>
|
||||||
#include <cache.h>
|
|
||||||
#include <commit.h>
|
#include <commit.h>
|
||||||
#include <diffcore.h>
|
#include <diffcore.h>
|
||||||
#include <diff.h>
|
#include <diff.h>
|
||||||
@ -19,6 +18,7 @@
|
|||||||
#include <object.h>
|
#include <object.h>
|
||||||
#include <object-name.h>
|
#include <object-name.h>
|
||||||
#include <object-store.h>
|
#include <object-store.h>
|
||||||
|
#include <path.h>
|
||||||
#include <refs.h>
|
#include <refs.h>
|
||||||
#include <revision.h>
|
#include <revision.h>
|
||||||
#include <setup.h>
|
#include <setup.h>
|
||||||
|
2
git
2
git
@ -1 +1 @@
|
|||||||
Subproject commit fe86abd7511a9a6862d5706c6fa1d9b57a63ba09
|
Subproject commit 43c8a30d150ecede9709c1f2527c8fba92c65f40
|
@ -54,7 +54,7 @@ static void scan_tree_repo_config(const char *name, const char *value)
|
|||||||
config_fn(repo, name, value);
|
config_fn(repo, name, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int gitconfig_config(const char *key, const char *value, void *cb)
|
static int gitconfig_config(const char *key, const char *value, const struct config_context *, void *cb)
|
||||||
{
|
{
|
||||||
const char *name;
|
const char *name;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user