From 321e3f24232f6ecd19ebec39b0bc77034b4ec7d2 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Thu, 21 Jun 2018 20:19:16 +0000
Subject: [PATCH] git: bump to 2.18.0.

---
 .../{git-2.17.1.recipe => git-2.18.0.recipe}  |  6 ++---
 ...it-2.17.1.patchset => git-2.18.0.patchset} | 22 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)
 rename dev-vcs/git/{git-2.17.1.recipe => git-2.18.0.recipe} (95%)
 rename dev-vcs/git/patches/{git-2.17.1.patchset => git-2.18.0.patchset} (90%)

diff --git a/dev-vcs/git/git-2.17.1.recipe b/dev-vcs/git/git-2.18.0.recipe
similarity index 95%
rename from dev-vcs/git/git-2.17.1.recipe
rename to dev-vcs/git/git-2.18.0.recipe
index 9ecb6f6d2..406bb78d2 100644
--- a/dev-vcs/git/git-2.17.1.recipe
+++ b/dev-vcs/git/git-2.18.0.recipe
@@ -13,13 +13,13 @@ LICENSE="GNU GPL v2"
 REVISION="1"
 
 SOURCE_URI="https://www.kernel.org/pub/software/scm/git/git-$portVersion.tar.xz"
-CHECKSUM_SHA256="79136e7aa83abae4d8a25c8111f113d3c5a63aeb5fd93cc72c26d49c6d5ba65e"
+CHECKSUM_SHA256="8b40be383a603147ae29337136c00d1c634bdfdc169a30924a024596a7e30e92"
 
 SOURCE_URI_2="https://www.kernel.org/pub/software/scm/git/git-manpages-$portVersion.tar.xz"
-CHECKSUM_SHA256_2="83d54786ea634488458486f262cb5157629a898f9d45f5d86b302aac79ceef54"
+CHECKSUM_SHA256_2="9ae3be95e63379597164c79c9018e84b7ef6964da923e5689dbc307693266096"
 
 SOURCE_URI_3="https://www.kernel.org/pub/software/scm/git/git-htmldocs-$portVersion.tar.xz"
-CHECKSUM_SHA256_3="945b1c8c8761e7c17ca39ce0fc5af94d2b238da37f8d2b1823c65302cfa4d275"
+CHECKSUM_SHA256_3="5b70d9b1f86aad464ae172040eb87da83058c00581388af6f60b050214912efc"
 
 PATCHES="git-$portVersion.patchset"
 
diff --git a/dev-vcs/git/patches/git-2.17.1.patchset b/dev-vcs/git/patches/git-2.18.0.patchset
similarity index 90%
rename from dev-vcs/git/patches/git-2.17.1.patchset
rename to dev-vcs/git/patches/git-2.18.0.patchset
index 5d7123de7..2c3d8afb5 100644
--- a/dev-vcs/git/patches/git-2.17.1.patchset
+++ b/dev-vcs/git/patches/git-2.18.0.patchset
@@ -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");