haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

git: bump version

Browse Source
This commit is contained in:
Jerome Duval
2021-01-04 16:48:43 +01:00
parent 7df74fb554
commit fc2c4cc688
2 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
dev-vcs/git/patches/git-2.28.0.patchset → dev-vcs/git/patches/git-2.30.0.patchset
View File

@@ -1,4 +1,4 @@
From 56acac1a903dcbdd37c3b57fc168ad20179596b1 Mon Sep 17 00:00:00 2001
From 1c74acedb8f0c4682a3e889cf23b43cde4b5f5a3 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.24.1
2.28.0
From 0f557f23acaef82951851dc2165c9a9a4065703e Mon Sep 17 00:00:00 2001
From aa131000e2bb5119015c0cdabeb026c03de8e659 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 88cf593..aa4eb37 100644
index 7b385e5..f0669d6 100644
--- a/path.c
+++ b/path.c
@@ -13,6 +13,11 @@
@@ -67,20 +67,20 @@ index 88cf593..aa4eb37 100644
home = getenv("HOME");
if (home)
--
2.24.1
2.28.0
From 2df42bd79662a4db16c91348283c22bddd728523 Mon Sep 17 00:00:00 2001
From b9658a023ab00baaabde5fb9a6eba55293b0a34b 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 d17d2bd..6d51342 100644
index 1137bd7..6dd4b41 100644
--- a/config.c
+++ b/config.c
@@ -2729,6 +2729,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
@@ -2761,6 +2761,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 d17d2bd..6d51342 100644
char *contents = NULL;
size_t contents_sz;
struct config_store_data store;
@@ -2745,6 +2746,12 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
@@ -2777,6 +2778,12 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
if (!config_filename)
config_filename = filename_buf = git_pathdup("config");
@@ -102,21 +102,21 @@ index d17d2bd..6d51342 100644
* The lock serves a purpose in addition to locking: the new
* contents of .git/config will be written into it.
--
2.24.1
2.28.0
From e2d721e9456e591cd467759a5b8fa6a9102df0b7 Mon Sep 17 00:00:00 2001
From 2af7a649faab7562fee5cd32de2a4e8e522b5c1b 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.
Do not clutter the home dir.
diff --git a/credential-cache.c b/credential-cache.c
index 1cccc3a..076f6fa 100644
--- a/credential-cache.c
+++ b/credential-cache.c
@@ -87,7 +87,7 @@ static char *get_socket_path(void)
diff --git a/builtin/credential-cache.c b/builtin/credential-cache.c
index 9b3f709..893db81 100644
--- a/builtin/credential-cache.c
+++ b/builtin/credential-cache.c
@@ -90,7 +90,7 @@ static char *get_socket_path(void)
{
struct stat sb;
char *old_dir, *socket;
@@ -126,20 +126,20 @@ index 1cccc3a..076f6fa 100644
socket = xstrfmt("%s/socket", old_dir);
else
--
2.24.1
2.28.0
From 5841649bb9d07c614031f95dc211e066b9f4650a Mon Sep 17 00:00:00 2001
From 0663035df5770c9cb2edc3c6f7578bfc38e5ef49 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 ee4aef6..7de3510 100644
index f71fa39..0843a19 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -645,24 +645,11 @@ int cmd_config(int argc, const char **argv, const char *prefix)
@@ -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");
@@ -169,10 +169,10 @@ index ee4aef6..7de3510 100644
}
else if (use_system_config) {
--
2.24.1
2.28.0
From 82d3fea48bc155df46881f065349b3408c4ac75b Mon Sep 17 00:00:00 2001
From 68029054d6d00db50c422d37284246908a493e26 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
@@ -196,20 +196,20 @@ index b074d1a..0f95000 100755
fi
--
2.24.1
2.28.0
From 3ff86a8daa60790bb711c0ffff255a4cecafda33 Mon Sep 17 00:00:00 2001
From 97dfbc1daa64c44975dc8617eacdf5a7688dcbc6 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 c83fd18..88e0c41 100644
index 882d26e..3252f7f 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -53,7 +53,7 @@ prove: pre-clean check-chainlint $(TEST_LINT)
@@ -54,7 +54,7 @@ prove: pre-clean check-chainlint $(TEST_LINT)
$(MAKE) clean-except-prove-cache
$(T):
@@ -219,5 +219,5 @@ index c83fd18..88e0c41 100644
pre-clean:
$(RM) -r '$(TEST_RESULTS_DIRECTORY_SQ)'
--
2.24.1
2.28.0