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

git-2.10.0: sync patch offsets.

Browse Source
This commit is contained in:
fbrosson
2016-09-19 18:34:02 +00:00
parent e2c6067690
commit cd3e02f4c3
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dev-vcs/git/patches/git-2.10.0.patchset
View File

@@ -30,7 +30,7 @@ Subject: On Haiku use the user settings directory instead of HOME
diff --git a/path.c b/path.c
index 17551c4..6d093db 100644
index fe3c4d9..adc5ad9 100644
--- a/path.c
+++ b/path.c
@@ -7,6 +7,11 @@
@@ -45,7 +45,7 @@ index 17551c4..6d093db 100644
static int get_st_mode_bits(const char *path, int *mode)
{
struct stat st;
@@ -1226,10 +1231,18 @@ char *xdg_config_home(const char *filename)
@@ -1228,10 +1233,18 @@ char *xdg_config_home(const char *filename)
{
const char *home, *config_home;
@@ -75,10 +75,10 @@ Subject: Ensure config-directory exists before using it.
diff --git a/config.c b/config.c
index d7ce34b..a6bd74c 100644
index 0dfed68..b583730 100644
--- a/config.c
+++ b/config.c
@@ -1996,6 +1996,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
@@ -2083,6 +2083,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
int ret;
struct lock_file *lock = NULL;
char *filename_buf = NULL;
@@ -86,7 +86,7 @@ index d7ce34b..a6bd74c 100644
char *contents = NULL;
size_t contents_sz;
@@ -2009,6 +2010,12 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
@@ -2096,6 +2097,12 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
if (!config_filename)
config_filename = filename_buf = git_pathdup("config");
@@ -111,10 +111,10 @@ 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 86e21de..bde0ae2 100644
index cc8a6ee..4a672f9 100644
--- a/credential-cache.c
+++ b/credential-cache.c
@@ -106,7 +106,7 @@ int main(int argc, const char **argv)
@@ -106,7 +106,7 @@ int cmd_main(int argc, const char **argv)
op = argv[0];
if (!socket_path)