mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
git: update to version 2.48.1. (#11834)
This commit is contained in:
OscarL
GitHub
@@ -1,4 +1,4 @@
|
||||
From 75e283ac24397b1559d3866f773480b934ed0003 Mon Sep 17 00:00:00 2001
|
||||
From 8b0ade14783117b4625355725b137e3cb04130a1 Mon Sep 17 00:00:00 2001
|
||||
From: Ingo Weinhold <ingo_weinhold@gmx.de>
|
||||
Date: Tue, 13 Aug 2013 08:07:25 +0200
|
||||
Subject: git-web--browse.sh: use "open" on Haiku
|
||||
@@ -21,20 +21,20 @@ index ae15253..b074d1a 100755
|
||||
init_browser_path $i
|
||||
if type "$browser_path" > /dev/null 2>&1; then
|
||||
--
|
||||
2.43.2
|
||||
2.48.1
|
||||
|
||||
|
||||
From af0ee01688986d7c8461d1f8f50c8d037f8d8449 Mon Sep 17 00:00:00 2001
|
||||
From 0a02737f1a4d199fa672295aa258f3418c8f878e Mon Sep 17 00:00:00 2001
|
||||
From: Ingo Weinhold <ingo_weinhold@gmx.de>
|
||||
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 d838d4b..d6827aa 100644
|
||||
index 07964f5..e536012 100644
|
||||
--- a/path.c
|
||||
+++ b/path.c
|
||||
@@ -19,6 +19,11 @@
|
||||
@@ -21,6 +21,11 @@
|
||||
#include "lockfile.h"
|
||||
#include "exec-cmd.h"
|
||||
|
||||
@@ -46,7 +46,7 @@ index d838d4b..d6827aa 100644
|
||||
static int get_st_mode_bits(const char *path, int *mode)
|
||||
{
|
||||
struct stat st;
|
||||
@@ -1535,11 +1540,19 @@ char *xdg_config_home_for(const char *subdir, const char *filename)
|
||||
@@ -1444,11 +1449,19 @@ char *xdg_config_home_for(const char *subdir, const char *filename)
|
||||
{
|
||||
const char *home, *config_home;
|
||||
|
||||
@@ -67,22 +67,22 @@ index d838d4b..d6827aa 100644
|
||||
home = getenv("HOME");
|
||||
if (home)
|
||||
--
|
||||
2.43.2
|
||||
2.48.1
|
||||
|
||||
|
||||
From 87074365dcc427a60d666bc4ce677824b6634724 Mon Sep 17 00:00:00 2001
|
||||
From 1ddc4bbc99323392f30cddfe1551c437781eda96 Mon Sep 17 00:00:00 2001
|
||||
From: Oliver Tappe <zooey@hirschkaefer.de>
|
||||
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 77a0fd2..9625246 100644
|
||||
index 50f2d17..c0d4588 100644
|
||||
--- a/config.c
|
||||
+++ b/config.c
|
||||
@@ -3300,6 +3300,14 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
|
||||
@@ -3202,6 +3202,14 @@ int repo_config_set_multivar_in_file_gently(struct repository *r,
|
||||
if (!config_filename)
|
||||
config_filename = filename_buf = git_pathdup("config");
|
||||
config_filename = filename_buf = repo_git_path(r, "config");
|
||||
|
||||
+ if (find_last_dir_sep(config_filename) != NULL) {
|
||||
+ char *config_dir = xstrdup(config_filename);
|
||||
@@ -96,10 +96,10 @@ index 77a0fd2..9625246 100644
|
||||
* The lock serves a purpose in addition to locking: the new
|
||||
* contents of .git/config will be written into it.
|
||||
--
|
||||
2.43.2
|
||||
2.48.1
|
||||
|
||||
|
||||
From caef08d8eb899a5fb3e5b7388e627864637c63a6 Mon Sep 17 00:00:00 2001
|
||||
From f16b9a017a867c601e0327304dfc322457572dd0 Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
Date: Sun, 14 Feb 2016 10:32:12 +0100
|
||||
Subject: Move credential cache to the config directory.
|
||||
@@ -107,10 +107,10 @@ Subject: Move credential cache to the config directory.
|
||||
Do not clutter the home dir.
|
||||
|
||||
diff --git a/builtin/credential-cache.c b/builtin/credential-cache.c
|
||||
index bef120b..9112f51 100644
|
||||
index 7f733cb..65319f5 100644
|
||||
--- a/builtin/credential-cache.c
|
||||
+++ b/builtin/credential-cache.c
|
||||
@@ -118,7 +118,7 @@ static char *get_socket_path(void)
|
||||
@@ -121,7 +121,7 @@ static char *get_socket_path(void)
|
||||
{
|
||||
struct stat sb;
|
||||
char *old_dir, *socket;
|
||||
@@ -120,10 +120,10 @@ index bef120b..9112f51 100644
|
||||
socket = xstrfmt("%s/socket", old_dir);
|
||||
else
|
||||
--
|
||||
2.43.2
|
||||
2.48.1
|
||||
|
||||
|
||||
From 9f4d2c847f0a70aac64e72af7510798a65301d73 Mon Sep 17 00:00:00 2001
|
||||
From 605b60f8211a4ee489812fa7b09211ab48f2cd9f Mon Sep 17 00:00:00 2001
|
||||
From: Oscar Lesta <oscar.lesta@gmail.com>
|
||||
Date: Fri, 24 May 2024 15:15:25 -0300
|
||||
Subject: config: use "xdg_config" even if "user_config" does not exist
|
||||
@@ -131,10 +131,10 @@ Subject: config: use "xdg_config" even if "user_config" does not exist
|
||||
Based on the previous patch by: sfanxiang <sfanxiang@gmail.com>
|
||||
|
||||
diff --git a/config.c b/config.c
|
||||
index 9625246..3c0b3d7 100644
|
||||
index c0d4588..0fd7fb3 100644
|
||||
--- a/config.c
|
||||
+++ b/config.c
|
||||
@@ -2013,18 +2013,12 @@ char *git_global_config(void)
|
||||
@@ -1993,18 +1993,12 @@ char *git_global_config(void)
|
||||
char *user_config, *xdg_config;
|
||||
|
||||
git_global_config_paths(&user_config, &xdg_config);
|
||||
@@ -159,10 +159,10 @@ index 9625246..3c0b3d7 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.43.2
|
||||
2.48.1
|
||||
|
||||
|
||||
From 2fcd662ed91d8d19257b05b4f29eacbd96251eaa Mon Sep 17 00:00:00 2001
|
||||
From df22c5cbdb9d817180cba41e9a691338a475642b Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
Date: Sun, 18 Nov 2018 11:56:26 +0100
|
||||
Subject: Fix detection of Haiku for git web browse
|
||||
@@ -186,20 +186,20 @@ index b074d1a..0f95000 100755
|
||||
fi
|
||||
|
||||
--
|
||||
2.43.2
|
||||
2.48.1
|
||||
|
||||
|
||||
From 0a0191c9582c02f39eed96778d154d1afb86929d Mon Sep 17 00:00:00 2001
|
||||
From 2a800a2751d6faf7f45357827d4f2e9eeee12ab2 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Fri, 29 Nov 2019 21:46:54 +0100
|
||||
Subject: ignore test failures.
|
||||
|
||||
|
||||
diff --git a/t/Makefile b/t/Makefile
|
||||
index 2d95046..4cc0249 100644
|
||||
index daa5fca..0b6dd8a 100644
|
||||
--- a/t/Makefile
|
||||
+++ b/t/Makefile
|
||||
@@ -71,7 +71,7 @@ prove: pre-clean check-chainlint $(TEST_LINT)
|
||||
@@ -74,7 +74,7 @@ prove: pre-clean check-chainlint $(TEST_LINT)
|
||||
$(MAKE) clean-except-prove-cache
|
||||
|
||||
$(T):
|
||||
@@ -209,10 +209,10 @@ index 2d95046..4cc0249 100644
|
||||
$(UNIT_TESTS):
|
||||
@echo "*** $@ ***"; $@
|
||||
--
|
||||
2.43.2
|
||||
2.48.1
|
||||
|
||||
|
||||
From a0f34cd84e222421e4c85c25965996b67b73d8ef Mon Sep 17 00:00:00 2001
|
||||
From 1b8fe359538a000bff88a15ca699e9e248fc7cf0 Mon Sep 17 00:00:00 2001
|
||||
From: Augustin Cavalier <waddlesplash@gmail.com>
|
||||
Date: Wed, 17 Nov 2021 18:11:17 -0500
|
||||
Subject: git-gui: Use symbolic links.
|
||||
@@ -241,5 +241,31 @@ index 667c39e..d05a4fd 100644
|
||||
CLEAN_DST = echo ' ' UNINSTALL
|
||||
REMOVE_D0 = dir=
|
||||
--
|
||||
2.43.2
|
||||
2.48.1
|
||||
|
||||
|
||||
From 1162ea6b43fc5de0438013699b24c804f9e1f828 Mon Sep 17 00:00:00 2001
|
||||
From: Oscar Lesta <oscar.lesta@gmail.com>
|
||||
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
|
||||
--- a/gettext.c
|
||||
+++ b/gettext.c
|
||||
@@ -118,6 +118,11 @@ void git_setup_gettext(void)
|
||||
}
|
||||
|
||||
bindtextdomain("git", podir);
|
||||
+#ifdef __HAIKU__
|
||||
+ // See HaikuPorts issue #11131
|
||||
+ setlocale(LC_ALL, "");
|
||||
+#else
|
||||
setlocale(LC_MESSAGES, "");
|
||||
setlocale(LC_TIME, "");
|
||||
+#endif
|
||||
init_gettext_charset("git");
|
||||
--
|
||||
2.48.1
|
||||
|
||||
Reference in New Issue
Block a user