diff --git a/dev-vcs/git/patches/git-2.24.1.patchset b/dev-vcs/git/patches/git-2.26.0.patchset similarity index 83% rename from dev-vcs/git/patches/git-2.24.1.patchset rename to dev-vcs/git/patches/git-2.26.0.patchset index c91a58c78..9434cd6a2 100644 --- a/dev-vcs/git/patches/git-2.24.1.patchset +++ b/dev-vcs/git/patches/git-2.26.0.patchset @@ -1,4 +1,4 @@ -From 3a21775c27aaad2806349cdf88b1aece7b143b8a Mon Sep 17 00:00:00 2001 +From 56acac1a903dcbdd37c3b57fc168ad20179596b1 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 13 Aug 2013 08:07:25 +0200 Subject: git-web--browse.sh: use "open" on Haiku @@ -21,22 +21,22 @@ index ae15253..b074d1a 100755 init_browser_path $i if type "$browser_path" > /dev/null 2>&1; then -- -2.19.1 +2.24.1 -From 19414f690ec4186b9a53b24879dab5caa12e6470 Mon Sep 17 00:00:00 2001 +From 0f557f23acaef82951851dc2165c9a9a4065703e 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 34f0f98..4ac1724 100644 +index 88cf593..aa4eb37 100644 --- a/path.c +++ b/path.c -@@ -12,6 +12,11 @@ - #include "packfile.h" +@@ -13,6 +13,11 @@ #include "object-store.h" + #include "lockfile.h" +#ifdef __HAIKU__ +#include @@ -46,7 +46,7 @@ index 34f0f98..4ac1724 100644 static int get_st_mode_bits(const char *path, int *mode) { struct stat st; -@@ -1416,10 +1421,19 @@ char *xdg_config_home(const char *filename) +@@ -1502,10 +1507,19 @@ char *xdg_config_home(const char *filename) { const char *home, *config_home; @@ -67,20 +67,20 @@ index 34f0f98..4ac1724 100644 home = getenv("HOME"); if (home) -- -2.19.1 +2.24.1 -From 6d966f301224d0606b60bf2037e2407aacea34e4 Mon Sep 17 00:00:00 2001 +From 2df42bd79662a4db16c91348283c22bddd728523 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 3461993..883c1d0 100644 +index d17d2bd..6d51342 100644 --- a/config.c +++ b/config.c -@@ -2666,6 +2666,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename, +@@ -2729,6 +2729,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename, int ret; struct lock_file lock = LOCK_INIT; char *filename_buf = NULL; @@ -88,7 +88,7 @@ index 3461993..883c1d0 100644 char *contents = NULL; size_t contents_sz; struct config_store_data store; -@@ -2682,6 +2683,12 @@ int git_config_set_multivar_in_file_gently(const char *config_filename, +@@ -2745,6 +2746,12 @@ int git_config_set_multivar_in_file_gently(const char *config_filename, if (!config_filename) config_filename = filename_buf = git_pathdup("config"); @@ -102,10 +102,10 @@ index 3461993..883c1d0 100644 * The lock serves a purpose in addition to locking: the new * contents of .git/config will be written into it. -- -2.19.1 +2.24.1 -From d4c9f44acb151692230a643db7807d7d5fbe11a9 Mon Sep 17 00:00:00 2001 +From e2d721e9456e591cd467759a5b8fa6a9102df0b7 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. @@ -126,20 +126,20 @@ index 1cccc3a..076f6fa 100644 socket = xstrfmt("%s/socket", old_dir); else -- -2.19.1 +2.24.1 -From b0e6909d55205f65c4d66b117a079e67af4e9f45 Mon Sep 17 00:00:00 2001 +From 5841649bb9d07c614031f95dc211e066b9f4650a Mon Sep 17 00:00:00 2001 From: sfanxiang Date: Mon, 1 Jan 2018 13:26:28 +0000 Subject: builtin: config: use xdg_config even if it does not exist diff --git a/builtin/config.c b/builtin/config.c -index 97b58c4..395ed85 100644 +index ee4aef6..7de3510 100644 --- a/builtin/config.c +++ b/builtin/config.c -@@ -623,22 +623,11 @@ int cmd_config(int argc, const char **argv, const char *prefix) +@@ -645,24 +645,11 @@ int cmd_config(int argc, const char **argv, const char *prefix) char *user_config = expand_user_path("~/.gitconfig", 0); char *xdg_config = xdg_config_home("config"); @@ -152,6 +152,8 @@ index 97b58c4..395ed85 100644 - */ - die(_("$HOME not set")); - +- given_config_source.scope = CONFIG_SCOPE_GLOBAL; +- - if (access_or_warn(user_config, R_OK, 0) && - xdg_config && !access_or_warn(xdg_config, R_OK, 0)) { - given_config_source.file = xdg_config; @@ -165,15 +167,15 @@ index 97b58c4..395ed85 100644 + if (user_config) free(user_config); } } - else if (use_system_config) + else if (use_system_config) { -- -2.19.1 +2.24.1 -From 6acf57f28109f6f9e6fd258422ec1aedd9f005ac Mon Sep 17 00:00:00 2001 +From 82d3fea48bc155df46881f065349b3408c4ac75b 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 +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. @@ -194,16 +196,14 @@ index b074d1a..0f95000 100755 fi -- -2.19.1 +2.24.1 -From 1a765af9aa140dc7232eebc2a09963abc49e4769 Mon Sep 17 00:00:00 2001 + +From 3ff86a8daa60790bb711c0ffff255a4cecafda33 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 29 Nov 2019 21:46:54 +0100 Subject: ignore test failures. ---- - t/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/Makefile b/t/Makefile index c83fd18..88e0c41 100644 @@ -219,4 +219,5 @@ index c83fd18..88e0c41 100644 pre-clean: $(RM) -r '$(TEST_RESULTS_DIRECTORY_SQ)' -- -2.24.0 +2.24.1 +