mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-10 13:50:08 +02:00
223 lines
6.1 KiB
Plaintext
223 lines
6.1 KiB
Plaintext
From 3a21775c27aaad2806349cdf88b1aece7b143b8a 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
|
|
|
|
|
|
diff --git a/git-web--browse.sh b/git-web--browse.sh
|
|
index ae15253..b074d1a 100755
|
|
--- a/git-web--browse.sh
|
|
+++ b/git-web--browse.sh
|
|
@@ -133,6 +133,11 @@ if test -z "$browser" ; then
|
|
browser_candidates="cygstart $browser_candidates"
|
|
fi
|
|
|
|
+ # /boot/system/haiku_loader indicates Haiku
|
|
+ if test -f /boot/system/haiku_loader; then
|
|
+ browser_candidates="open $browser_candidates"
|
|
+ fi
|
|
+
|
|
for i in $browser_candidates; do
|
|
init_browser_path $i
|
|
if type "$browser_path" > /dev/null 2>&1; then
|
|
--
|
|
2.19.1
|
|
|
|
|
|
From 19414f690ec4186b9a53b24879dab5caa12e6470 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 34f0f98..4ac1724 100644
|
|
--- a/path.c
|
|
+++ b/path.c
|
|
@@ -12,6 +12,11 @@
|
|
#include "packfile.h"
|
|
#include "object-store.h"
|
|
|
|
+#ifdef __HAIKU__
|
|
+#include <FindDirectory.h>
|
|
+#include <StorageDefs.h>
|
|
+#endif
|
|
+
|
|
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)
|
|
{
|
|
const char *home, *config_home;
|
|
|
|
+#ifdef __HAIKU__
|
|
+ char settingsPath[B_PATH_NAME_LENGTH];
|
|
+ assert(filename);
|
|
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, true, settingsPath,
|
|
+ sizeof(settingsPath)) == B_OK)
|
|
+ return mkpathdup("%s/git/%s", settingsPath, filename);
|
|
+#else
|
|
assert(filename);
|
|
config_home = getenv("XDG_CONFIG_HOME");
|
|
+
|
|
if (config_home && *config_home)
|
|
return mkpathdup("%s/git/%s", config_home, filename);
|
|
+#endif
|
|
|
|
home = getenv("HOME");
|
|
if (home)
|
|
--
|
|
2.19.1
|
|
|
|
|
|
From 6d966f301224d0606b60bf2037e2407aacea34e4 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 3461993..883c1d0 100644
|
|
--- a/config.c
|
|
+++ b/config.c
|
|
@@ -2666,6 +2666,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;
|
|
+ char *config_dir = NULL;
|
|
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,
|
|
if (!config_filename)
|
|
config_filename = filename_buf = git_pathdup("config");
|
|
|
|
+ config_dir = xstrdup(config_filename);
|
|
+ * find_last_dir_sep(config_dir) = '\0';
|
|
+ if (access(config_dir, F_OK) != 0)
|
|
+ mkdir(config_dir, 0755);
|
|
+ free(config_dir);
|
|
+
|
|
/*
|
|
* The lock serves a purpose in addition to locking: the new
|
|
* contents of .git/config will be written into it.
|
|
--
|
|
2.19.1
|
|
|
|
|
|
From d4c9f44acb151692230a643db7807d7d5fbe11a9 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)
|
|
{
|
|
struct stat sb;
|
|
char *old_dir, *socket;
|
|
- old_dir = expand_user_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.19.1
|
|
|
|
|
|
From b0e6909d55205f65c4d66b117a079e67af4e9f45 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 97b58c4..395ed85 100644
|
|
--- a/builtin/config.c
|
|
+++ b/builtin/config.c
|
|
@@ -623,22 +623,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");
|
|
|
|
- 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"));
|
|
-
|
|
- 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);
|
|
}
|
|
}
|
|
else if (use_system_config)
|
|
--
|
|
2.19.1
|
|
|
|
|
|
From 6acf57f28109f6f9e6fd258422ec1aedd9f005ac 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
|
|
|
|
The bootloader was renamed, so it is not a reliable thing to use. Detect
|
|
the BEINCLUDES environment variable instead.
|
|
|
|
diff --git a/git-web--browse.sh b/git-web--browse.sh
|
|
index b074d1a..0f95000 100755
|
|
--- a/git-web--browse.sh
|
|
+++ b/git-web--browse.sh
|
|
@@ -133,8 +133,8 @@ if test -z "$browser" ; then
|
|
browser_candidates="cygstart $browser_candidates"
|
|
fi
|
|
|
|
- # /boot/system/haiku_loader indicates Haiku
|
|
- if test -f /boot/system/haiku_loader; then
|
|
+ # BEINCLUDES indicates Haiku
|
|
+ if test -n "$BEINCLUDES"; then
|
|
browser_candidates="open $browser_candidates"
|
|
fi
|
|
|
|
--
|
|
2.19.1
|
|
|
|
From 1a765af9aa140dc7232eebc2a09963abc49e4769 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.
|
|
|
|
---
|
|
t/Makefile | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/t/Makefile b/t/Makefile
|
|
index c83fd18..88e0c41 100644
|
|
--- a/t/Makefile
|
|
+++ b/t/Makefile
|
|
@@ -53,7 +53,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)'
|
|
--
|
|
2.24.0
|