mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 03:30:05 +02:00
git: bump to 2.11.1.
This commit is contained in:
@@ -30,7 +30,7 @@ Subject: On Haiku use the user settings directory instead of HOME
|
||||
|
||||
|
||||
diff --git a/path.c b/path.c
|
||||
index 52d889c..fc5a2ff 100644
|
||||
index efcedaf..e96d512 100644
|
||||
--- a/path.c
|
||||
+++ b/path.c
|
||||
@@ -8,6 +8,11 @@
|
||||
@@ -45,7 +45,7 @@ index 52d889c..fc5a2ff 100644
|
||||
static int get_st_mode_bits(const char *path, int *mode)
|
||||
{
|
||||
struct stat st;
|
||||
@@ -1256,10 +1261,18 @@ char *xdg_config_home(const char *filename)
|
||||
@@ -1261,10 +1266,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 83fdecb..6c9fca1 100644
|
||||
index 617b2e3..9debb9d 100644
|
||||
--- a/config.c
|
||||
+++ b/config.c
|
||||
@@ -2083,6 +2083,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
|
||||
@@ -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;
|
||||
@@ -86,7 +86,7 @@ index 83fdecb..6c9fca1 100644
|
||||
char *contents = NULL;
|
||||
size_t contents_sz;
|
||||
|
||||
@@ -2096,6 +2097,12 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
|
||||
@@ -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");
|
||||
|
||||
Reference in New Issue
Block a user