From: Christian Hesse <m...@eworm.de> Update to git version v2.49.0-rc2, this requires changes for these upstream commits:
* 88dd321cfedc6ee190dfafe4670a83ea33cdf4a3 path: drop `git_path()` in favor of `repo_git_path()` Signed-off-by: Christian Hesse <m...@eworm.de> --- Makefile | 4 ++-- git | 2 +- ui-clone.c | 12 +++++++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index e788deb..f9d31fb 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = <openssl/sha.h> -GIT_VER = 2.48.1 -GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz +GIT_VER = 2.49.0.rc2 +GIT_URL = https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.xz INSTALL = install COPYTREE = cp -r MAN5_TXT = $(wildcard *.5.txt) diff --git a/git b/git index f93ff17..87a0bdb 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit f93ff170b93a1782659637824b25923245ac9dd1 +Subproject commit 87a0bdbf0f72b7561f3cd50636eee33dcb7dbcc3 diff --git a/ui-clone.c b/ui-clone.c index 31989a5..2ed3e1c 100644 --- a/ui-clone.c +++ b/ui-clone.c @@ -95,7 +95,7 @@ void cgit_clone_info(void) void cgit_clone_objects(void) { - char *p; + char *p, *path; if (!ctx.qry.path) goto err; @@ -116,7 +116,9 @@ void cgit_clone_objects(void) goto err; } - send_file(git_path("objects/%s", ctx.qry.path)); + path = repo_git_path(the_repository, "objects/%s", ctx.qry.path); + send_file(path); + free(path); return; err: @@ -125,5 +127,9 @@ err: void cgit_clone_head(void) { - send_file(git_path("%s", "HEAD")); + char *path; + + path = repo_git_path(the_repository, "HEAD"); + send_file(path); + free(path); }
