mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
git: add recipe for version 2.42.0 (#9569)
Include bash-completion and prompt scripts. Also: remove old 2.30.0 recipe.
This commit is contained in:
OscarL
GitHub
@@ -1,4 +1,4 @@
|
||||
From f1fc231c2e257a644cacd9a9f6311ea59b8f178d Mon Sep 17 00:00:00 2001
|
||||
From f848ea5b273e070c22dd5d9659180b28eab55cc6 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,22 +21,22 @@ index ae15253..b074d1a 100755
|
||||
init_browser_path $i
|
||||
if type "$browser_path" > /dev/null 2>&1; then
|
||||
--
|
||||
2.30.0
|
||||
2.37.3
|
||||
|
||||
|
||||
From bfb2c3b810c8235348c02afb82dbd8253058270d Mon Sep 17 00:00:00 2001
|
||||
From 3d173515b72bbb12fbbbb7a28ca76eaffad6eccf 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 7b385e5..f0669d6 100644
|
||||
index 67e2690..95d98f3 100644
|
||||
--- a/path.c
|
||||
+++ b/path.c
|
||||
@@ -13,6 +13,11 @@
|
||||
#include "object-store.h"
|
||||
@@ -19,6 +19,11 @@
|
||||
#include "lockfile.h"
|
||||
#include "exec-cmd.h"
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+#include <FindDirectory.h>
|
||||
@@ -46,7 +46,7 @@ index 7b385e5..f0669d6 100644
|
||||
static int get_st_mode_bits(const char *path, int *mode)
|
||||
{
|
||||
struct stat st;
|
||||
@@ -1502,10 +1507,19 @@ char *xdg_config_home(const char *filename)
|
||||
@@ -1550,11 +1555,19 @@ char *xdg_config_home_for(const char *subdir, const char *filename)
|
||||
{
|
||||
const char *home, *config_home;
|
||||
|
||||
@@ -57,30 +57,30 @@ index 7b385e5..f0669d6 100644
|
||||
+ sizeof(settingsPath)) == B_OK)
|
||||
+ return mkpathdup("%s/git/%s", settingsPath, filename);
|
||||
+#else
|
||||
assert(subdir);
|
||||
assert(filename);
|
||||
config_home = getenv("XDG_CONFIG_HOME");
|
||||
+
|
||||
if (config_home && *config_home)
|
||||
return mkpathdup("%s/git/%s", config_home, filename);
|
||||
return mkpathdup("%s/%s/%s", config_home, subdir, filename);
|
||||
+#endif
|
||||
|
||||
home = getenv("HOME");
|
||||
if (home)
|
||||
--
|
||||
2.30.0
|
||||
2.37.3
|
||||
|
||||
|
||||
From 1a25c7c85ac35a748b8bccb64862f2c0c88f92e5 Mon Sep 17 00:00:00 2001
|
||||
From 37020c1d335aad247c188108ec4083dc44dc239c 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 1137bd7..14cd935 100644
|
||||
index 3846a37..301ad6c 100644
|
||||
--- a/config.c
|
||||
+++ b/config.c
|
||||
@@ -2777,6 +2777,14 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
|
||||
@@ -3342,6 +3342,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 1137bd7..14cd935 100644
|
||||
* The lock serves a purpose in addition to locking: the new
|
||||
* contents of .git/config will be written into it.
|
||||
--
|
||||
2.30.0
|
||||
2.37.3
|
||||
|
||||
|
||||
From b4d5770706a101133ca8b32350c39e8bd3c133e6 Mon Sep 17 00:00:00 2001
|
||||
From 9086bb3a2e3d8083b60a94204e4db3f7df8ad742 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,36 +107,36 @@ 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 9b3f709..893db81 100644
|
||||
index 43b9d0e..9e8be52 100644
|
||||
--- a/builtin/credential-cache.c
|
||||
+++ b/builtin/credential-cache.c
|
||||
@@ -90,7 +90,7 @@ static char *get_socket_path(void)
|
||||
@@ -120,7 +120,7 @@ static char *get_socket_path(void)
|
||||
{
|
||||
struct stat sb;
|
||||
char *old_dir, *socket;
|
||||
- old_dir = expand_user_path("~/.git-credential-cache", 0);
|
||||
- old_dir = interpolate_path("~/.git-credential-cache", 0);
|
||||
+ old_dir = xdg_config_home("credential-cache");
|
||||
if (old_dir && !stat(old_dir, &sb) && S_ISDIR(sb.st_mode))
|
||||
socket = xstrfmt("%s/socket", old_dir);
|
||||
else
|
||||
--
|
||||
2.30.0
|
||||
2.37.3
|
||||
|
||||
|
||||
From 9460278c9eeefb9400ed24b214da394e7310eb51 Mon Sep 17 00:00:00 2001
|
||||
From e9e1546f40bf9bab2158b83aa553440ab91407a0 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
|
||||
|
||||
|
||||
diff --git a/builtin/config.c b/builtin/config.c
|
||||
index f71fa39..0843a19 100644
|
||||
index 11a4d4e..67dc39d 100644
|
||||
--- a/builtin/config.c
|
||||
+++ b/builtin/config.c
|
||||
@@ -674,24 +674,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");
|
||||
@@ -711,24 +711,11 @@ int cmd_config(int argc, const char **argv, const char *prefix)
|
||||
char *user_config, *xdg_config;
|
||||
|
||||
git_global_config(&user_config, &xdg_config);
|
||||
- if (!user_config)
|
||||
- /*
|
||||
- * It is unknown if HOME/.gitconfig exists, so
|
||||
@@ -163,10 +163,10 @@ index f71fa39..0843a19 100644
|
||||
}
|
||||
else if (use_system_config) {
|
||||
--
|
||||
2.30.0
|
||||
2.37.3
|
||||
|
||||
|
||||
From b8d68d0d6336135fdc4c37351c369b4c5c90197c Mon Sep 17 00:00:00 2001
|
||||
From 2c82a2f2ea5a11d8265af1dec9ac803e7fbecd2b 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,20 +190,20 @@ index b074d1a..0f95000 100755
|
||||
fi
|
||||
|
||||
--
|
||||
2.30.0
|
||||
2.37.3
|
||||
|
||||
|
||||
From 3e184bad49786c265d2826bb5c34986ed2f2e483 Mon Sep 17 00:00:00 2001
|
||||
From 4987ee3ec76af0db865e0899a315d9403b3d1657 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 882d26e..3252f7f 100644
|
||||
index 3e00cdd..8b27e50 100644
|
||||
--- a/t/Makefile
|
||||
+++ b/t/Makefile
|
||||
@@ -54,7 +54,7 @@ prove: pre-clean check-chainlint $(TEST_LINT)
|
||||
@@ -63,7 +63,7 @@ prove: pre-clean check-chainlint $(TEST_LINT)
|
||||
$(MAKE) clean-except-prove-cache
|
||||
|
||||
$(T):
|
||||
@@ -213,5 +213,37 @@ index 882d26e..3252f7f 100644
|
||||
pre-clean:
|
||||
$(RM) -r '$(TEST_RESULTS_DIRECTORY_SQ)'
|
||||
--
|
||||
2.30.0
|
||||
2.37.3
|
||||
|
||||
|
||||
From 1683665e2a7192afce292530e7259f37acd02ea2 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 a0d5a4b..b00a622 100644
|
||||
--- a/git-gui/Makefile
|
||||
+++ b/git-gui/Makefile
|
||||
@@ -59,7 +59,7 @@ INSTALL_X1 =
|
||||
INSTALL_A0 = find # space is required here
|
||||
INSTALL_A1 = | cpio -pud
|
||||
INSTALL_L0 = rm -f # space is required here
|
||||
-INSTALL_L1 = && ln # space is required here
|
||||
+INSTALL_L1 = && ln -s # space is required here
|
||||
INSTALL_L2 =
|
||||
INSTALL_L3 =
|
||||
|
||||
@@ -89,7 +89,7 @@ ifndef V
|
||||
INSTALL_L0 = dst=
|
||||
INSTALL_L1 = && src=
|
||||
INSTALL_L2 = && dst=
|
||||
- INSTALL_L3 = && echo ' ' 'LINK ' `basename "$$dst"` '->' `basename "$$src"` && rm -f "$$dst" && ln "$$src" "$$dst"
|
||||
+ INSTALL_L3 = && echo ' ' 'LINK ' `basename "$$dst"` '->' `basename "$$src"` && rm -f "$$dst" && ln -s "$$src" "$$dst"
|
||||
|
||||
CLEAN_DST = echo ' ' UNINSTALL
|
||||
REMOVE_D0 = dir=
|
||||
--
|
||||
2.37.3
|
||||
|
||||
Reference in New Issue
Block a user