Update git to 2.48.1
3 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 5606281..9032647 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
all::
-CGIT_VERSION = 1.4.1
+CGIT_VERSION = 1.5.1
CGIT_SCRIPT_NAME = cgit.cgi
CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
diff --git a/default.nix b/default.nix
index fed5a34..0f15596 100644
--- a/default.nix
+++ b/default.nix
@@ -7,20 +7,19 @@
callPackage (import (pkgs.path + "/pkgs/applications/version-management/cgit/common.nix") rec {
pname = "cgit-magenta";
- version = "1.4.1";
+ version = "1.5.1";
src = ./.;
# cgit-pink is tightly coupled with git and needs a git source tree to build.
# IMPORTANT: Remember to check which git version cgit-pink needs on every
# version bump (look for "GIT_VER" in the top-level Makefile).
gitSrc = fetchurl {
- url = "mirror://kernel/software/scm/git/git-2.36.1.tar.xz";
- sha256 = "0w43a35mhc2qf2gjkxjlnkf2lq8g0snf34iy5gqx2678yq7llpa0";
+ url = "mirror://kernel/software/scm/git/git-2.48.1.tar.xz";
+ sha256 = "HF1UX13B61HpXSxQ2Y/fiLGja6H6MOmuXVOFxgJPgq0=";
};
homepage = "https://cgit.rory.gay/cgit-magenta.git/about/";
description = "cgit fork aiming for better maintenance (again)";
- #maintainers = with lib.maintainers; [ sternenseemann ];
maintainers = [];
}) { }
diff --git a/ui-shared.c b/ui-shared.c
index fce1de2..d579190 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -945,6 +945,7 @@ static int print_this_commit_option(void)
return 0;
}
+
static int print_branch_option(const struct reference *ref, void *cb_data)
{
char *name = (char *)ref->name;
|
