From 2b4a6858ec6263b596acd9d1f35a1a81795a82f5 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Tue, 11 Sep 2018 00:51:04 +0000
Subject: [PATCH] git: bump to 2.19.0, mark as tested. Add
 TEST_REQUIRES="cmd:diff"

Move GLOBAL_WRITABLE_FILES & USER_SETTINGS_FILES before PROVIDES.

BTW, adding TEST_REQUIRES="cmd:diff" would have helped #2417.
---
 .../{git-2.18.0.recipe => git-2.19.0.recipe}  | 23 +++++++++++--------
 ...it-2.18.0.patchset => git-2.19.0.patchset} | 14 +++++------
 2 files changed, 20 insertions(+), 17 deletions(-)
 rename dev-vcs/git/{git-2.18.0.recipe => git-2.19.0.recipe} (94%)
 rename dev-vcs/git/patches/{git-2.18.0.patchset => git-2.19.0.patchset} (93%)

diff --git a/dev-vcs/git/git-2.18.0.recipe b/dev-vcs/git/git-2.19.0.recipe
similarity index 94%
rename from dev-vcs/git/git-2.18.0.recipe
rename to dev-vcs/git/git-2.19.0.recipe
index 406bb78d2..6e54f7291 100644
--- a/dev-vcs/git/git-2.18.0.recipe
+++ b/dev-vcs/git/git-2.19.0.recipe
@@ -13,17 +13,24 @@ LICENSE="GNU GPL v2"
 REVISION="1"
 
 SOURCE_URI="https://www.kernel.org/pub/software/scm/git/git-$portVersion.tar.xz"
-CHECKSUM_SHA256="8b40be383a603147ae29337136c00d1c634bdfdc169a30924a024596a7e30e92"
+CHECKSUM_SHA256="180feff58fc0d965d23ea010aa2c69ead92ec318eb9b09cf737529aec62f3ef4"
 
 SOURCE_URI_2="https://www.kernel.org/pub/software/scm/git/git-manpages-$portVersion.tar.xz"
-CHECKSUM_SHA256_2="9ae3be95e63379597164c79c9018e84b7ef6964da923e5689dbc307693266096"
+CHECKSUM_SHA256_2="4e51041b9636a1fdd8887091d1cca8b0cc6af3f1761870edd091e074378e7dcb"
 
 SOURCE_URI_3="https://www.kernel.org/pub/software/scm/git/git-htmldocs-$portVersion.tar.xz"
-CHECKSUM_SHA256_3="5b70d9b1f86aad464ae172040eb87da83058c00581388af6f60b050214912efc"
+CHECKSUM_SHA256_3="d5f850b9c6e87ad10ff24801c1c5ab9cd769e9e444881e9fdb8e6cc116fd8040"
 
 PATCHES="git-$portVersion.patchset"
 
-ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+GLOBAL_WRITABLE_FILES="
+	settings/gitconfig keep-old
+	"
+USER_SETTINGS_FILES="
+	settings/git directory
+	"
 
 PROVIDES="
 	git = $portVersion compat >= 2.3
@@ -126,12 +133,8 @@ BUILD_PREREQUIRES="
 	cmd:tar
 	"
 
-USER_SETTINGS_FILES="
-	settings/git directory
-	"
-
-GLOBAL_WRITABLE_FILES="
-	settings/gitconfig keep-old
+TEST_REQUIRES="
+	cmd:diff
 	"
 
 makeGit()
diff --git a/dev-vcs/git/patches/git-2.18.0.patchset b/dev-vcs/git/patches/git-2.19.0.patchset
similarity index 93%
rename from dev-vcs/git/patches/git-2.18.0.patchset
rename to dev-vcs/git/patches/git-2.19.0.patchset
index 2c3d8afb5..59a11bd58 100644
--- a/dev-vcs/git/patches/git-2.18.0.patchset
+++ b/dev-vcs/git/patches/git-2.19.0.patchset
@@ -31,7 +31,7 @@ Subject: On Haiku use the user settings directory instead of HOME
 
 
 diff --git a/path.c b/path.c
-index 7f109f6..a4eb8bb 100644
+index 34f0f98..4ac1724 100644
 --- a/path.c
 +++ b/path.c
 @@ -12,6 +12,11 @@
@@ -77,10 +77,10 @@ Subject: Ensure config-directory exists before using it.
 
 
 diff --git a/config.c b/config.c
-index fbbf0f8..7de79b6 100644
+index 3461993..883c1d0 100644
 --- a/config.c
 +++ b/config.c
-@@ -2657,6 +2657,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
+@@ -2666,6 +2666,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;
@@ -88,7 +88,7 @@ index fbbf0f8..7de79b6 100644
  	char *contents = NULL;
  	size_t contents_sz;
  	struct config_store_data store;
-@@ -2673,6 +2674,12 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
+@@ -2682,6 +2683,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 b29d26d..7e1828f 100644
+index 97b58c4..395ed85 100644
 --- a/builtin/config.c
 +++ b/builtin/config.c
-@@ -615,22 +615,11 @@ int cmd_config(int argc, const char **argv, const char *prefix)
+@@ -623,22 +623,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");
  
@@ -150,7 +150,7 @@ index b29d26d..7e1828f 100644
 -			 * location; error out even if XDG_CONFIG_HOME
 -			 * is set and points at a sane location.
 -			 */
--			die("$HOME not set");
+-			die(_("$HOME not set"));
 -
 -		if (access_or_warn(user_config, R_OK, 0) &&
 -		    xdg_config && !access_or_warn(xdg_config, R_OK, 0)) {