mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 03:30:05 +02:00
git: add 2.16.0, drop 2.14.3. (#2138)
This commit is contained in:
fbrosson
GitHub
@@ -8,18 +8,18 @@ It outclasses SCM tools like Subversion, CVS, Perforce, and ClearCase with \
|
||||
features like cheap local branching, convenient staging areas, and multiple \
|
||||
workflows."
|
||||
HOMEPAGE="https://git-scm.com/"
|
||||
COPYRIGHT="2005-2017 Git Authors (see git web site for list)"
|
||||
COPYRIGHT="2005-2018 Git Authors (see git web site for list)"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="1"
|
||||
|
||||
SOURCE_URI="https://www.kernel.org/pub/software/scm/git/git-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="5330960dd52467f6e5bf1931b9fd42b76d3f8ce9bc75150b54ecfb57d407151d"
|
||||
CHECKSUM_SHA256="0d10764e66b3d650dee0d99a1c77afa4aaae5e739c0973fcc1c5b9e6516e30f8"
|
||||
|
||||
SOURCE_URI_2="https://www.kernel.org/pub/software/scm/git/git-manpages-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256_2="5b0e3d93bafd539046b67778db0b5d627fe08ee5ef1be8b5b924517ed141b001"
|
||||
CHECKSUM_SHA256_2="894224a6eb67dd00bec8dcf83f357b03d5aec351c29a8d62de030be778dcab4c"
|
||||
|
||||
SOURCE_URI_3="https://www.kernel.org/pub/software/scm/git/git-htmldocs-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256_3="9d28b922ad861bf747ca34a4f083efa3ce41ca39cccb0dfab8bdcf0b58694ccb"
|
||||
CHECKSUM_SHA256_3="26ea1a977d45a955000345cf52d65e51f573a2a9382a67adca570f3a58be47d8"
|
||||
|
||||
PATCHES="git-$portVersion.patchset"
|
||||
|
||||
@@ -5,20 +5,21 @@ Subject: git-web--browse.sh: use "open" on Haiku
|
||||
|
||||
|
||||
diff --git a/git-web--browse.sh b/git-web--browse.sh
|
||||
index ae15253..1f6e306 100755
|
||||
index ae15253..b074d1a 100755
|
||||
--- a/git-web--browse.sh
|
||||
+++ b/git-web--browse.sh
|
||||
@@ -132,6 +132,10 @@ if test -z "$browser" ; then
|
||||
if test -x /usr/bin/cygstart; then
|
||||
@@ -133,6 +133,11 @@ if test -z "$browser" ; then
|
||||
browser_candidates="cygstart $browser_candidates"
|
||||
fi
|
||||
|
||||
+ # /boot/system/haiku_loader indicates Haiku
|
||||
+ if test -f /boot/system/haiku_loader; then
|
||||
+ browser_candidates="open $browser_candidates"
|
||||
+ fi
|
||||
|
||||
+
|
||||
for i in $browser_candidates; do
|
||||
init_browser_path $i
|
||||
if type "$browser_path" > /dev/null 2>&1; then
|
||||
--
|
||||
2.14.2
|
||||
|
||||
@@ -30,12 +31,12 @@ Subject: On Haiku use the user settings directory instead of HOME
|
||||
|
||||
|
||||
diff --git a/path.c b/path.c
|
||||
index 335d4dd..615c9d4 100644
|
||||
index da8b655..ec3d6c2 100644
|
||||
--- a/path.c
|
||||
+++ b/path.c
|
||||
@@ -10,6 +10,11 @@
|
||||
#include "submodule-config.h"
|
||||
@@ -11,6 +11,11 @@
|
||||
#include "path.h"
|
||||
#include "packfile.h"
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+#include <FindDirectory.h>
|
||||
@@ -45,7 +46,7 @@ index 335d4dd..615c9d4 100644
|
||||
static int get_st_mode_bits(const char *path, int *mode)
|
||||
{
|
||||
struct stat st;
|
||||
@@ -1330,10 +1335,19 @@ char *xdg_config_home(const char *filename)
|
||||
@@ -1331,10 +1336,19 @@ char *xdg_config_home(const char *filename)
|
||||
{
|
||||
const char *home, *config_home;
|
||||
|
||||
@@ -76,18 +77,18 @@ Subject: Ensure config-directory exists before using it.
|
||||
|
||||
|
||||
diff --git a/config.c b/config.c
|
||||
index 17e1349..ad93c39 100644
|
||||
index e617c20..5f7a752 100644
|
||||
--- a/config.c
|
||||
+++ b/config.c
|
||||
@@ -2404,6 +2404,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
|
||||
@@ -2477,6 +2477,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
|
||||
int ret;
|
||||
static struct lock_file lock;
|
||||
struct lock_file lock = LOCK_INIT;
|
||||
char *filename_buf = NULL;
|
||||
+ char *config_dir = NULL;
|
||||
char *contents = NULL;
|
||||
size_t contents_sz;
|
||||
|
||||
@@ -2417,6 +2418,12 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
|
||||
@@ -2490,6 +2491,12 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
|
||||
if (!config_filename)
|
||||
config_filename = filename_buf = git_pathdup("config");
|
||||
|
||||
@@ -127,3 +128,44 @@ index 1cccc3a..076f6fa 100644
|
||||
--
|
||||
2.14.2
|
||||
|
||||
|
||||
From 6cc7223d58b1fbb829d462e682ba32b7ebf91404 Mon Sep 17 00:00:00 2001
|
||||
From: sfanxiang <sfanxiang@gmail.com>
|
||||
Date: Mon, 1 Jan 2018 13:26:28 +0000
|
||||
Subject: builtin: config: use xdg_config even if it does not exist
|
||||
|
||||
|
||||
diff --git a/builtin/config.c b/builtin/config.c
|
||||
index ab5f954..dc3e123 100644
|
||||
--- a/builtin/config.c
|
||||
+++ b/builtin/config.c
|
||||
@@ -516,22 +516,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");
|
||||
|
||||
- if (!user_config)
|
||||
- /*
|
||||
- * It is unknown if HOME/.gitconfig exists, so
|
||||
- * we do not know if we should write to XDG
|
||||
- * location; error out even if XDG_CONFIG_HOME
|
||||
- * is set and points at a sane location.
|
||||
- */
|
||||
- die("$HOME not set");
|
||||
-
|
||||
- if (access_or_warn(user_config, R_OK, 0) &&
|
||||
- xdg_config && !access_or_warn(xdg_config, R_OK, 0)) {
|
||||
- given_config_source.file = xdg_config;
|
||||
- free(user_config);
|
||||
- } else {
|
||||
+ if (!xdg_config) {
|
||||
given_config_source.file = user_config;
|
||||
- free(xdg_config);
|
||||
+ } else {
|
||||
+ given_config_source.file = xdg_config;
|
||||
+ if (user_config) free(user_config);
|
||||
}
|
||||
}
|
||||
else if (use_system_config)
|
||||
--
|
||||
2.15.1
|
||||
|
||||
Reference in New Issue
Block a user