diff options
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | cgit.c | 2 | ||||
m--------- | git | 0 |
3 files changed, 2 insertions, 2 deletions
@@ -14,7 +14,7 @@ htmldir = $(docdir) | |||
14 | pdfdir = $(docdir) | 14 | pdfdir = $(docdir) |
15 | mandir = $(prefix)/share/man | 15 | mandir = $(prefix)/share/man |
16 | SHA1_HEADER = <openssl/sha.h> | 16 | SHA1_HEADER = <openssl/sha.h> |
17 | GIT_VER = 2.24.1 | 17 | GIT_VER = 2.25.0 |
18 | GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz | 18 | GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz |
19 | INSTALL = install | 19 | INSTALL = install |
20 | COPYTREE = cp -r | 20 | COPYTREE = cp -r |
@@ -579,7 +579,7 @@ static void prepare_repo_env(int *nongit) | |||
579 | * load local configuration from the git repository, so we do them both while | 579 | * load local configuration from the git repository, so we do them both while |
580 | * the HOME variables are unset. */ | 580 | * the HOME variables are unset. */ |
581 | setup_git_directory_gently(nongit); | 581 | setup_git_directory_gently(nongit); |
582 | init_display_notes(NULL); | 582 | load_display_notes(NULL); |
583 | } | 583 | } |
584 | 584 | ||
585 | static int prepare_repo_cmd(int nongit) | 585 | static int prepare_repo_cmd(int nongit) |
diff --git a/git b/git | |||
Subproject 53a06cf39b756eddfe4a2a34da93e3d04eb7b72 | Subproject d0654dc308b0ba76dd8ed7bbb33c8d8f7aacd78 | ||