about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2025-03-12 17:13:02 +0100
committerRory& <root@rory.gay>2025-07-02 11:49:46 +0200
commitf328431543177eff338903af31fa7baabff3f52d (patch)
treed5ffe6d71b079ea4220979058484d566c650b851
parentWIP: Add config bits for tarball compression settings (diff)
downloadcgit-magenta-f328431543177eff338903af31fa7baabff3f52d.tar.xz
git: update to v2.49.0
Update to git version v2.49.0, this requires changes for these
upstream commits:

* 88dd321cfedc6ee190dfafe4670a83ea33cdf4a3
  path: drop `git_path()` in favor of `repo_git_path()`

Signed-off-by: Christian Hesse <mail@eworm.de>
-rw-r--r--Makefile2
m---------git0
-rw-r--r--ui-clone.c12
3 files changed, 10 insertions, 4 deletions
diff --git a/Makefile b/Makefile

index 416469c..755d9a6 100644 --- a/Makefile +++ b/Makefile
@@ -1,7 +1,7 @@ all:: CGIT_VERSION = 1.5.1 -GIT_VER = 2.48.1 +GIT_VER = 2.49.0 CGIT_SCRIPT_NAME = cgit.cgi CGIT_SCRIPT_PATH = /var/www/htdocs/cgit CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) diff --git a/git b/git -Subproject f93ff170b93a1782659637824b25923245ac9dd +Subproject 683c54c999c301c2cd6f715c411407c413b1d84 diff --git a/ui-clone.c b/ui-clone.c
index 282d1e1..7a98315 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); }