diff --git a/dev-vcs/git/git-2.7.0.recipe b/dev-vcs/git/git-2.7.0.recipe index 71d02772b..5d943b51b 100644 --- a/dev-vcs/git/git-2.7.0.recipe +++ b/dev-vcs/git/git-2.7.0.recipe @@ -21,7 +21,7 @@ CHECKSUM_SHA256_2="b7f255aa17a5d06b9b71f6e3957f65e8f15789b2d31f09b1c2bf697a21458 SOURCE_URI_3="https://www.kernel.org/pub/software/scm/git/git-htmldocs-$portVersion.tar.xz" CHECKSUM_SHA256_3="a9d30a744eb07392ba3ffe389cca7e57a2bdd718c9ffccdf2d525eeafac548a9" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64" diff --git a/dev-vcs/git/patches/git-2.7.0.patchset b/dev-vcs/git/patches/git-2.7.0.patchset index b6805941e..600fa93fd 100644 --- a/dev-vcs/git/patches/git-2.7.0.patchset +++ b/dev-vcs/git/patches/git-2.7.0.patchset @@ -1,4 +1,4 @@ -From 33b47b9b1b7ff02d3b04da8d6f763fe744aa39d8 Mon Sep 17 00:00:00 2001 +From fc9ad1e70a926bf499369ffdb4423acb15eeb8a4 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 13 Aug 2013 08:07:25 +0200 Subject: git-web--browse.sh: use "open" on Haiku @@ -20,17 +20,17 @@ index ae15253..1f6e306 100755 for i in $browser_candidates; do init_browser_path $i -- -2.2.2 +2.7.0 -From e3bdc3cfdf6d91d622e9f047bb727272ab8528f5 Mon Sep 17 00:00:00 2001 +From 5fcb76ee57c563a202ba82baabf45b98254ac4ea Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 19 Jan 2015 15:37:16 -0500 Subject: On Haiku use the user settings directory instead of HOME diff --git a/path.c b/path.c -index 38f2ebd..9c7cb48 100644 +index 3cd155e..a258488 100644 --- a/path.c +++ b/path.c @@ -6,6 +6,11 @@ @@ -45,7 +45,7 @@ index 38f2ebd..9c7cb48 100644 static int get_st_mode_bits(const char *path, int *mode) { struct stat st; -@@ -946,10 +951,18 @@ char *xdg_config_home(const char *filename) +@@ -1186,10 +1191,18 @@ char *xdg_config_home(const char *filename) { const char *home, *config_home; @@ -65,17 +65,17 @@ index 38f2ebd..9c7cb48 100644 home = getenv("HOME"); if (home) -- -2.2.2 +2.7.0 -From 34967add7a2fefa52b1a2b005745e17d1712545b Mon Sep 17 00:00:00 2001 +From b5c943af488c6432f4cafda86b2cf36cbb1397a4 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 19 Jan 2015 15:50:09 -0500 Subject: Ensure config-directory exists before using it. diff --git a/config.c b/config.c -index 248a21a..a04d467 100644 +index 86a5eb2..fee1d81 100644 --- a/config.c +++ b/config.c @@ -1958,6 +1958,7 @@ int git_config_set_multivar_in_file(const char *config_filename, @@ -100,5 +100,29 @@ index 248a21a..a04d467 100644 * The lock serves a purpose in addition to locking: the new * contents of .git/config will be written into it. -- -2.2.2 +2.7.0 + + +From 381c60e6253fdd4df55e32df25f470e0fa58efec Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sun, 14 Feb 2016 10:32:12 +0100 +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 f4afdc6..19a150e 100644 +--- a/credential-cache.c ++++ b/credential-cache.c +@@ -105,7 +105,7 @@ int main(int argc, const char **argv) + op = argv[0]; + + if (!socket_path) +- socket_path = expand_user_path("~/.git-credential-cache/socket"); ++ socket_path = xdg_config_home("credential-cache/socket"); + if (!socket_path) + die("unable to find a suitable socket path; use --socket"); + +-- +2.7.0