mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-10 05:40:07 +02:00
129 lines
3.5 KiB
Plaintext
129 lines
3.5 KiB
Plaintext
From 2d096b055bfc6b4ce12f780d7944f7639d9f00e0 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..1f6e306 100755
|
|
--- a/git-web--browse.sh
|
|
+++ b/git-web--browse.sh
|
|
@@ -132,6 +132,10 @@ if test -z "$browser" ; then
|
|
if test -x /usr/bin/cygstart; 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
|
|
--
|
|
2.10.2
|
|
|
|
|
|
From d29dc93eb523f18e41bdb56f2383998913e0a340 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 efcedaf..e96d512 100644
|
|
--- a/path.c
|
|
+++ b/path.c
|
|
@@ -8,6 +8,11 @@
|
|
#include "worktree.h"
|
|
#include "submodule-config.h"
|
|
|
|
+#ifdef __HAIKU__
|
|
+#include <FindDirectory.h>
|
|
+#include <StorageDefs.h>
|
|
+#endif
|
|
+
|
|
static int get_st_mode_bits(const char *path, int *mode)
|
|
{
|
|
struct stat st;
|
|
@@ -1261,10 +1266,18 @@ 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
|
|
config_home = getenv("XDG_CONFIG_HOME");
|
|
+ assert(filename);
|
|
if (config_home && *config_home)
|
|
return mkpathdup("%s/git/%s", config_home, filename);
|
|
+#endif
|
|
|
|
home = getenv("HOME");
|
|
if (home)
|
|
--
|
|
2.10.2
|
|
|
|
|
|
From 231ca400b0392ead1a17255f4257a28f90bfc8c1 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 617b2e3..9debb9d 100644
|
|
--- a/config.c
|
|
+++ b/config.c
|
|
@@ -2105,6 +2105,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
|
|
int ret;
|
|
struct lock_file *lock = NULL;
|
|
char *filename_buf = NULL;
|
|
+ char *config_dir = NULL;
|
|
char *contents = NULL;
|
|
size_t contents_sz;
|
|
|
|
@@ -2118,6 +2119,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.10.2
|
|
|
|
|
|
From 7044a4e19c25312ee6c69da23acfa4cedbe51887 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 cc8a6ee..4a672f9 100644
|
|
--- a/credential-cache.c
|
|
+++ b/credential-cache.c
|
|
@@ -106,7 +106,7 @@ int cmd_main(int argc, const char **argv)
|
|
op = argv[0];
|
|
|
|
if (!socket_path)
|
|
- socket_path = expand_user_path("~/.git-credential-cache/socket");
|
|
+ socket_path = xdg_config_home("credential-cache/socket");
|
|
if (!socket_path)
|
|
die("unable to find a suitable socket path; use --socket");
|
|
|
|
--
|
|
2.10.2
|
|
|