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

git: bump to 2.18.0.

Browse Source
This commit is contained in:
fbrosson
2018-06-21 20:19:16 +00:00
parent 89f8cc31d6
commit 321e3f2423
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dev-vcs/git/patches/git-2.17.1.patchset → dev-vcs/git/patches/git-2.18.0.patchset
View File

@@ -31,12 +31,12 @@ Subject: On Haiku use the user settings directory instead of HOME
diff --git a/path.c b/path.c
index 4c4a751..9129188 100644
index 7f109f6..a4eb8bb 100644
--- a/path.c
+++ b/path.c
@@ -11,6 +11,11 @@
#include "path.h"
@@ -12,6 +12,11 @@
#include "packfile.h"
#include "object-store.h"
+#ifdef __HAIKU__
+#include <FindDirectory.h>
@@ -46,13 +46,13 @@ index 4c4a751..9129188 100644
static int get_st_mode_bits(const char *path, int *mode)
{
struct stat st;
@@ -1415,10 +1420,19 @@ char *xdg_config_home(const char *filename)
@@ -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);
+ assert(filename);
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, true, settingsPath,
+ sizeof(settingsPath)) == B_OK)
+ return mkpathdup("%s/git/%s", settingsPath, filename);
@@ -77,18 +77,18 @@ Subject: Ensure config-directory exists before using it.
diff --git a/config.c b/config.c
index b0c20e6..859d92b 100644
index fbbf0f8..7de79b6 100644
--- a/config.c
+++ b/config.c
@@ -2485,6 +2485,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
@@ -2657,6 +2657,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;
@@ -2498,6 +2499,12 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
struct config_store_data store;
@@ -2673,6 +2674,12 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
if (!config_filename)
config_filename = filename_buf = git_pathdup("config");
@@ -136,10 +136,10 @@ Subject: builtin: config: use xdg_config even if it does not exist
diff --git a/builtin/config.c b/builtin/config.c
index 01169dd..5378d33 100644
index b29d26d..7e1828f 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -523,22 +523,11 @@ int cmd_config(int argc, const char **argv, const char *prefix)
@@ -615,22 +615,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");