mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
git: update to version 2.45.1 (#10473)
This commit is contained in:
OscarL
GitHub
@@ -12,19 +12,17 @@ COPYRIGHT="2005-2023 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="f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9"
|
||||
CHECKSUM_SHA256="e64d340a8e627ae22cfb8bcc651cca0b497cf1e9fdf523735544ff4a732f12bf"
|
||||
SOURCE_URI_2="https://www.kernel.org/pub/software/scm/git/git-manpages-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256_2="3739b021aa186a59de42153b70306684e7da85715d37a1b3bfe614c3dda0cab1"
|
||||
CHECKSUM_SHA256_2="e622d7ab1114b4f67cb9d8d4ab81f6e0fcf3d1291711569befda29172315d9f0"
|
||||
SOURCE_URI_3="https://www.kernel.org/pub/software/scm/git/git-htmldocs-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256_3="9b3265e3a825f6eaac3ef29b2ae82aeffd71f30e039f2e173f9df95e15d6ebf7"
|
||||
CHECKSUM_SHA256_3="f7095c4478028bc04afd63cd217ea5d4fa08ab819cbb66df40a1a12648edbf40"
|
||||
PATCHES="git-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
GLOBAL_WRITABLE_FILES="
|
||||
# settings/etc/profile.d/git-completion.sh keep-old
|
||||
# settings/etc/profile.d/git-prompt.sh keep-old
|
||||
settings/gitconfig keep-old
|
||||
"
|
||||
USER_SETTINGS_FILES="
|
||||
@@ -225,12 +223,9 @@ INSTALL()
|
||||
mkdir -p $htmlDir
|
||||
cp -rd $sourceDir3/*.html $htmlDir/
|
||||
|
||||
# copy bash-completions and prompt scripts
|
||||
# Disable for now: https://github.com/haikuports/haikuports/issues/9741
|
||||
# profileDir=$settingsDir/etc/profile.d
|
||||
# mkdir -p $profileDir
|
||||
# cp $sourceDir/contrib/completion/git-completion.bash $profileDir/git-completion.sh
|
||||
# cp $sourceDir/contrib/completion/git-prompt.sh $profileDir
|
||||
# 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
|
||||
|
||||
# Default system-wide gitconfig. Settings in this file are only used
|
||||
# if they are unset both for the repository and globally (global options
|
||||
@@ -311,13 +306,13 @@ INSTALL()
|
||||
|
||||
TEST()
|
||||
{
|
||||
# Version 2.42.0 results on 32 bits (x86), after around 4 hours:
|
||||
#failed test(s): t0005 t0006 t0007 t0061 t0210 t0211 t0301 t0302 t0410 t1060 t1300 t1305 t1306 t1308 t1309 t1419 t1800 t2400 t3600 t3903 t5300 t5351 t5531 t5604 t5605 t5616 t5702 t5730 t5810 t5814 t7060 t7300 t7408 t7450 t7701 t7900 t9210
|
||||
# Version 2.45.1, results on beta4 64 bits (x86), after around 5 hours:
|
||||
#failed test(s): t0005 t0006 t0007 t0033 t0061 t0210 t0211 t0301 t0302 t0410 t1060 t1300 t1305 t1306 t1308 t1309 t1419 t1800 t2400 t3600 t3903 t5000 t5300 t5329 t5351 t5523 t5533 t5604 t5605 t5616 t5702 t5730 t5810 t5814 t7060 t7300 t7408 t7450 t7701 t7704 t7900
|
||||
#fixed 1
|
||||
#success 27429
|
||||
#failed 103
|
||||
#broken 265
|
||||
#total 28402
|
||||
#success 28387
|
||||
#failed 100
|
||||
#broken 264
|
||||
#total 29442
|
||||
|
||||
cat << DONE
|
||||
!!Make sure to configure the debug_server in \
|
||||
@@ -1,4 +1,4 @@
|
||||
From 2b068650b98a70d5043fd8e5d78307b36d75d933 Mon Sep 17 00:00:00 2001
|
||||
From 75e283ac24397b1559d3866f773480b934ed0003 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,17 +21,17 @@ index ae15253..b074d1a 100755
|
||||
init_browser_path $i
|
||||
if type "$browser_path" > /dev/null 2>&1; then
|
||||
--
|
||||
2.42.1
|
||||
2.43.2
|
||||
|
||||
|
||||
From 2044c3faec789218c6a5ea84d86d83dbf33303b6 Mon Sep 17 00:00:00 2001
|
||||
From af0ee01688986d7c8461d1f8f50c8d037f8d8449 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 67e2690..95d98f3 100644
|
||||
index d838d4b..d6827aa 100644
|
||||
--- a/path.c
|
||||
+++ b/path.c
|
||||
@@ -19,6 +19,11 @@
|
||||
@@ -46,7 +46,7 @@ index 67e2690..95d98f3 100644
|
||||
static int get_st_mode_bits(const char *path, int *mode)
|
||||
{
|
||||
struct stat st;
|
||||
@@ -1550,11 +1555,19 @@ char *xdg_config_home_for(const char *subdir, const char *filename)
|
||||
@@ -1535,11 +1540,19 @@ char *xdg_config_home_for(const char *subdir, const char *filename)
|
||||
{
|
||||
const char *home, *config_home;
|
||||
|
||||
@@ -67,20 +67,20 @@ index 67e2690..95d98f3 100644
|
||||
home = getenv("HOME");
|
||||
if (home)
|
||||
--
|
||||
2.42.1
|
||||
2.43.2
|
||||
|
||||
|
||||
From 38ed749a67a68fd99ffe70867d63c4af6458176c Mon Sep 17 00:00:00 2001
|
||||
From 87074365dcc427a60d666bc4ce677824b6634724 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 9ff6ae1..dc1b3c1 100644
|
||||
index 77a0fd2..9625246 100644
|
||||
--- a/config.c
|
||||
+++ b/config.c
|
||||
@@ -3196,6 +3196,14 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
|
||||
@@ -3300,6 +3300,14 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
|
||||
if (!config_filename)
|
||||
config_filename = filename_buf = git_pathdup("config");
|
||||
|
||||
@@ -96,10 +96,10 @@ index 9ff6ae1..dc1b3c1 100644
|
||||
* The lock serves a purpose in addition to locking: the new
|
||||
* contents of .git/config will be written into it.
|
||||
--
|
||||
2.42.1
|
||||
2.43.2
|
||||
|
||||
|
||||
From a2e72070f1d0ac280e316a8e3f6392742047cecb Mon Sep 17 00:00:00 2001
|
||||
From caef08d8eb899a5fb3e5b7388e627864637c63a6 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,7 +107,7 @@ 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 bba96d4..52af077 100644
|
||||
index bef120b..9112f51 100644
|
||||
--- a/builtin/credential-cache.c
|
||||
+++ b/builtin/credential-cache.c
|
||||
@@ -118,7 +118,7 @@ static char *get_socket_path(void)
|
||||
@@ -120,53 +120,49 @@ index bba96d4..52af077 100644
|
||||
socket = xstrfmt("%s/socket", old_dir);
|
||||
else
|
||||
--
|
||||
2.42.1
|
||||
2.43.2
|
||||
|
||||
|
||||
From de7c3f6327496e87d11db4fca561bdaaee46c263 Mon Sep 17 00:00:00 2001
|
||||
From: sfanxiang <sfanxiang@gmail.com>
|
||||
Date: Mon, 1 Jan 2018 13:26:28 +0000
|
||||
Subject: builtin: config: use xdg_config even if it does not exist
|
||||
From 9f4d2c847f0a70aac64e72af7510798a65301d73 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
|
||||
|
||||
Based on the previous patch by: sfanxiang <sfanxiang@gmail.com>
|
||||
|
||||
diff --git a/builtin/config.c b/builtin/config.c
|
||||
index 11a4d4e..67dc39d 100644
|
||||
--- a/builtin/config.c
|
||||
+++ b/builtin/config.c
|
||||
@@ -711,24 +711,11 @@ int cmd_config(int argc, const char **argv, const char *prefix)
|
||||
char *user_config, *xdg_config;
|
||||
diff --git a/config.c b/config.c
|
||||
index 9625246..3c0b3d7 100644
|
||||
--- a/config.c
|
||||
+++ b/config.c
|
||||
@@ -2013,18 +2013,12 @@ char *git_global_config(void)
|
||||
char *user_config, *xdg_config;
|
||||
|
||||
git_global_config(&user_config, &xdg_config);
|
||||
- if (!user_config)
|
||||
- /*
|
||||
- * It is unknown if HOME/.gitconfig exists, so
|
||||
- * we do not know if we should write to XDG
|
||||
- * location; error out even if XDG_CONFIG_HOME
|
||||
- * is set and points at a sane location.
|
||||
- */
|
||||
- die(_("$HOME not set"));
|
||||
git_global_config_paths(&user_config, &xdg_config);
|
||||
- if (!user_config) {
|
||||
- free(xdg_config);
|
||||
- return NULL;
|
||||
- }
|
||||
-
|
||||
- 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;
|
||||
- free(user_config);
|
||||
- } else {
|
||||
+ if (!xdg_config) {
|
||||
given_config_source.file = user_config;
|
||||
- free(xdg_config);
|
||||
+ } else {
|
||||
+ given_config_source.file = xdg_config;
|
||||
+ if (user_config) free(user_config);
|
||||
}
|
||||
- if (access_or_warn(user_config, R_OK, 0) && xdg_config &&
|
||||
- !access_or_warn(xdg_config, R_OK, 0)) {
|
||||
- free(user_config);
|
||||
- return xdg_config;
|
||||
- } else {
|
||||
- free(xdg_config);
|
||||
+ if (!xdg_config)
|
||||
return user_config;
|
||||
+ else {
|
||||
+ if (user_config)
|
||||
+ free(user_config);
|
||||
+ return xdg_config;
|
||||
}
|
||||
else if (use_system_config) {
|
||||
}
|
||||
|
||||
--
|
||||
2.42.1
|
||||
2.43.2
|
||||
|
||||
|
||||
From e760a2733796a1a329b73fd586e7fc1a0a66583d Mon Sep 17 00:00:00 2001
|
||||
From 2fcd662ed91d8d19257b05b4f29eacbd96251eaa 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
|
||||
@@ -190,40 +186,40 @@ index b074d1a..0f95000 100755
|
||||
fi
|
||||
|
||||
--
|
||||
2.42.1
|
||||
2.43.2
|
||||
|
||||
|
||||
From 95bb6016f79aec4d15f3c42b4281af2a9f050a1d Mon Sep 17 00:00:00 2001
|
||||
From 0a0191c9582c02f39eed96778d154d1afb86929d 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 fae3012..22798c1 100644
|
||||
index 2d95046..4cc0249 100644
|
||||
--- a/t/Makefile
|
||||
+++ b/t/Makefile
|
||||
@@ -63,7 +63,7 @@ prove: pre-clean check-chainlint $(TEST_LINT)
|
||||
@@ -71,7 +71,7 @@ prove: pre-clean check-chainlint $(TEST_LINT)
|
||||
$(MAKE) clean-except-prove-cache
|
||||
|
||||
$(T):
|
||||
- @echo "*** $@ ***"; '$(TEST_SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
|
||||
+ - @echo "*** $@ ***"; '$(TEST_SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
|
||||
|
||||
pre-clean:
|
||||
$(RM) -r '$(TEST_RESULTS_DIRECTORY_SQ)'
|
||||
$(UNIT_TESTS):
|
||||
@echo "*** $@ ***"; $@
|
||||
--
|
||||
2.42.1
|
||||
2.43.2
|
||||
|
||||
|
||||
From bdcdb42ad1d8936edb4d0d06a455e493c08947fd Mon Sep 17 00:00:00 2001
|
||||
From a0f34cd84e222421e4c85c25965996b67b73d8ef 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.
|
||||
|
||||
|
||||
diff --git a/git-gui/Makefile b/git-gui/Makefile
|
||||
index 3f80435..69c1ef6 100644
|
||||
index 667c39e..d05a4fd 100644
|
||||
--- a/git-gui/Makefile
|
||||
+++ b/git-gui/Makefile
|
||||
@@ -59,7 +59,7 @@ INSTALL_X1 =
|
||||
@@ -245,5 +241,5 @@ index 3f80435..69c1ef6 100644
|
||||
CLEAN_DST = echo ' ' UNINSTALL
|
||||
REMOVE_D0 = dir=
|
||||
--
|
||||
2.42.1
|
||||
2.43.2
|
||||
|
||||
Reference in New Issue
Block a user