diff --git a/dev-vcs/git/git-2.48.1.recipe b/dev-vcs/git/git-2.50.1.recipe similarity index 96% rename from dev-vcs/git/git-2.48.1.recipe rename to dev-vcs/git/git-2.50.1.recipe index 917b675f9..af5fe241a 100644 --- a/dev-vcs/git/git-2.48.1.recipe +++ b/dev-vcs/git/git-2.50.1.recipe @@ -12,11 +12,11 @@ COPYRIGHT="2005-2025 Git Authors (see git web site for list)" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://www.kernel.org/pub/software/scm/git/git-$portVersion.tar.xz" -CHECKSUM_SHA256="1c5d545f5dc1eb51e95d2c50d98fdf88b1a36ba1fa30e9ae5d5385c6024f82ad" +CHECKSUM_SHA256="7e3e6c36decbd8f1eedd14d42db6674be03671c2204864befa2a41756c5c8fc4" SOURCE_URI_2="https://www.kernel.org/pub/software/scm/git/git-manpages-$portVersion.tar.xz" -CHECKSUM_SHA256_2="4c0ede7afa4d6dbf602d2f2fd151c36ab57d3224e6b9fd17342e85f05d386886" +CHECKSUM_SHA256_2="7dd86882bbc22bef8852924de96b9cb378aad8532089e301c82093da3e7c5478" SOURCE_URI_3="https://www.kernel.org/pub/software/scm/git/git-htmldocs-$portVersion.tar.xz" -CHECKSUM_SHA256_3="5450321b7de6702f9ec0a41108dfac3626afeb8fdd575b3d9a78febfaa96315c" +CHECKSUM_SHA256_3="d15ccd1518b822e317d14b63de4444bb288909294f117cbbfa385c60ab739bca" PATCHES="git-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" @@ -161,6 +161,7 @@ REQUIRES_web=" haiku$secondaryArchSuffix git$secondaryArchSuffix == $portVersion base git${secondaryArchSuffix}_perl == $portVersion + cgi # CGI.pm " BUILD_REQUIRES=" @@ -249,6 +250,8 @@ INSTALL() # Add bash-completions (will work if the "bash_completion" package is installed). install -d -m 755 $dataDir/bash-completion/completions install -m 644 $sourceDir/contrib/completion/git-completion.bash $dataDir/bash-completion/completions/git + # Remove the one that gets installed via "makeGit install" (starting with git 2.50.0). + rm -rf $prefix/share # Default system-wide gitconfig. Settings in this file are only used # if they are unset both for the repository and globally (global options diff --git a/dev-vcs/git/patches/git-2.48.1.patchset b/dev-vcs/git/patches/git-2.50.1.patchset similarity index 73% rename from dev-vcs/git/patches/git-2.48.1.patchset rename to dev-vcs/git/patches/git-2.50.1.patchset index 23911c3a2..6ad9f5cbf 100644 --- a/dev-vcs/git/patches/git-2.48.1.patchset +++ b/dev-vcs/git/patches/git-2.50.1.patchset @@ -1,19 +1,21 @@ -From 8b0ade14783117b4625355725b137e3cb04130a1 Mon Sep 17 00:00:00 2001 -From: Ingo Weinhold -Date: Tue, 13 Aug 2013 08:07:25 +0200 +From 102f99f9d7cb64b395624382e61ef28e1145efc2 Mon Sep 17 00:00:00 2001 +From: Oscar Lesta +Date: Thu, 7 Aug 2025 00:10:27 -0300 Subject: git-web--browse.sh: use "open" on Haiku +This is a squashed commit from previous ones from Ingo Weinhold and +Adrien Destugues. diff --git a/git-web--browse.sh b/git-web--browse.sh -index ae15253..b074d1a 100755 +index ae15253..0f95000 100755 --- a/git-web--browse.sh +++ b/git-web--browse.sh @@ -133,6 +133,11 @@ if test -z "$browser" ; then browser_candidates="cygstart $browser_candidates" fi -+ # /boot/system/haiku_loader indicates Haiku -+ if test -f /boot/system/haiku_loader; then ++ # BEINCLUDES indicates Haiku ++ if test -n "$BEINCLUDES"; then + browser_candidates="open $browser_candidates" + fi + @@ -24,17 +26,17 @@ index ae15253..b074d1a 100755 2.48.1 -From 0a02737f1a4d199fa672295aa258f3418c8f878e Mon Sep 17 00:00:00 2001 +From 8563acff85b61f400ca5bdcc63018aae3079d0e9 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 19 Jan 2015 15:37:16 -0500 Subject: On Haiku use the user settings directory instead of HOME diff --git a/path.c b/path.c -index 07964f5..e536012 100644 +index 3b598b2..e3a9475 100644 --- a/path.c +++ b/path.c -@@ -21,6 +21,11 @@ +@@ -19,6 +19,11 @@ #include "lockfile.h" #include "exec-cmd.h" @@ -46,7 +48,7 @@ index 07964f5..e536012 100644 static int get_st_mode_bits(const char *path, int *mode) { struct stat st; -@@ -1444,11 +1449,19 @@ char *xdg_config_home_for(const char *subdir, const char *filename) +@@ -1641,11 +1646,19 @@ char *xdg_config_home_for(const char *subdir, const char *filename) { const char *home, *config_home; @@ -70,17 +72,17 @@ index 07964f5..e536012 100644 2.48.1 -From 1ddc4bbc99323392f30cddfe1551c437781eda96 Mon Sep 17 00:00:00 2001 +From 8f3679bb9f7473fa99fe4eefff653f112acce87d Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 19 Jan 2015 15:50:09 -0500 Subject: Ensure config-directory exists before using it. diff --git a/config.c b/config.c -index 50f2d17..c0d4588 100644 +index e2ee0cb..e05c2ca 100644 --- a/config.c +++ b/config.c -@@ -3202,6 +3202,14 @@ int repo_config_set_multivar_in_file_gently(struct repository *r, +@@ -3197,6 +3197,14 @@ int repo_config_set_multivar_in_file_gently(struct repository *r, if (!config_filename) config_filename = filename_buf = repo_git_path(r, "config"); @@ -99,7 +101,7 @@ index 50f2d17..c0d4588 100644 2.48.1 -From f16b9a017a867c601e0327304dfc322457572dd0 Mon Sep 17 00:00:00 2001 +From ff1cbc99e6fe8aba815078b0d86f26a86492ec75 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 14 Feb 2016 10:32:12 +0100 Subject: Move credential cache to the config directory. @@ -123,7 +125,7 @@ index 7f733cb..65319f5 100644 2.48.1 -From 605b60f8211a4ee489812fa7b09211ab48f2cd9f Mon Sep 17 00:00:00 2001 +From bb83687ff6879eb6d011ea248f70e940bdd10f7c Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Fri, 24 May 2024 15:15:25 -0300 Subject: config: use "xdg_config" even if "user_config" does not exist @@ -131,10 +133,10 @@ Subject: config: use "xdg_config" even if "user_config" does not exist Based on the previous patch by: sfanxiang diff --git a/config.c b/config.c -index c0d4588..0fd7fb3 100644 +index e05c2ca..14b9ffd 100644 --- a/config.c +++ b/config.c -@@ -1993,18 +1993,12 @@ char *git_global_config(void) +@@ -1984,18 +1984,12 @@ char *git_global_config(void) char *user_config, *xdg_config; git_global_config_paths(&user_config, &xdg_config); @@ -162,44 +164,17 @@ index c0d4588..0fd7fb3 100644 2.48.1 -From df22c5cbdb9d817180cba41e9a691338a475642b Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Sun, 18 Nov 2018 11:56:26 +0100 -Subject: Fix detection of Haiku for git web browse - -The bootloader was renamed, so it is not a reliable thing to use. Detect -the BEINCLUDES environment variable instead. - -diff --git a/git-web--browse.sh b/git-web--browse.sh -index b074d1a..0f95000 100755 ---- a/git-web--browse.sh -+++ b/git-web--browse.sh -@@ -133,8 +133,8 @@ if test -z "$browser" ; then - browser_candidates="cygstart $browser_candidates" - fi - -- # /boot/system/haiku_loader indicates Haiku -- if test -f /boot/system/haiku_loader; then -+ # BEINCLUDES indicates Haiku -+ if test -n "$BEINCLUDES"; then - browser_candidates="open $browser_candidates" - fi - --- -2.48.1 - - -From 2a800a2751d6faf7f45357827d4f2e9eeee12ab2 Mon Sep 17 00:00:00 2001 +From 0ed9dc6e7aee57ec600c86f9111b1c39c2df3e0d Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 29 Nov 2019 21:46:54 +0100 Subject: ignore test failures. diff --git a/t/Makefile b/t/Makefile -index daa5fca..0b6dd8a 100644 +index 791e0a0..7929fdd 100644 --- a/t/Makefile +++ b/t/Makefile -@@ -74,7 +74,7 @@ prove: pre-clean check-chainlint $(TEST_LINT) +@@ -79,7 +79,7 @@ prove: pre-clean $(TEST_LINT) $(MAKE) clean-except-prove-cache $(T): @@ -212,17 +187,17 @@ index daa5fca..0b6dd8a 100644 2.48.1 -From 1b8fe359538a000bff88a15ca699e9e248fc7cf0 Mon Sep 17 00:00:00 2001 +From 91a39212e8d76177fe5342582937b599c62cdb21 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 17 Nov 2021 18:11:17 -0500 Subject: git-gui: Use symbolic links. diff --git a/git-gui/Makefile b/git-gui/Makefile -index 667c39e..d05a4fd 100644 +index 8672dd2..77cf3bd 100644 --- a/git-gui/Makefile +++ b/git-gui/Makefile -@@ -59,7 +59,7 @@ INSTALL_X1 = +@@ -57,7 +57,7 @@ INSTALL_X1 = INSTALL_A0 = find # space is required here INSTALL_A1 = | cpio -pud INSTALL_L0 = rm -f # space is required here @@ -231,7 +206,7 @@ index 667c39e..d05a4fd 100644 INSTALL_L2 = INSTALL_L3 = -@@ -89,7 +89,7 @@ ifndef V +@@ -86,7 +86,7 @@ ifndef V INSTALL_L0 = dst= INSTALL_L1 = && src= INSTALL_L2 = && dst= @@ -244,17 +219,17 @@ index 667c39e..d05a4fd 100644 2.48.1 -From 1162ea6b43fc5de0438013699b24c804f9e1f828 Mon Sep 17 00:00:00 2001 +From ae1f13c6d2977776fbf3668c90d06b02461930f8 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Fri, 28 Feb 2025 15:50:56 -0300 Subject: Workaround for HaikuPorts issue #11131. diff --git a/gettext.c b/gettext.c -index 8d08a61..0defa18 100644 +index 8d08a61..3664663 100644 --- a/gettext.c +++ b/gettext.c -@@ -118,6 +118,11 @@ void git_setup_gettext(void) +@@ -118,8 +118,13 @@ void git_setup_gettext(void) } bindtextdomain("git", podir); @@ -266,6 +241,31 @@ index 8d08a61..0defa18 100644 setlocale(LC_TIME, ""); +#endif init_gettext_charset("git"); + textdomain("git"); + +-- +2.48.1 + + +From be2345db2d9e2cfbdd2e82f1671907258b3f2acf Mon Sep 17 00:00:00 2001 +From: Oscar Lesta +Date: Wed, 6 Aug 2025 23:56:38 -0300 +Subject: Use `python3` as hashbang for the generated gitweb.py. + + +diff --git a/git-instaweb.sh b/git-instaweb.sh +index 7b44f70..7da5219 100755 +--- a/git-instaweb.sh ++++ b/git-instaweb.sh +@@ -615,7 +615,7 @@ python_conf() { + # This assumes that python is in user's $PATH + # This script is Python 2 and 3 compatible + cat > "$fqgitdir/gitweb/gitweb.py" <