git: remove older recipes. (#9710)

This commit is contained in:
OscarL
2023-10-30 08:44:27 -03:00
committed by GitHub
parent 09cbe41364
commit d11598cfc5
4 changed files with 0 additions and 1100 deletions

View File

@@ -1,296 +0,0 @@
SUMMARY="Fast, scalable, distributed revision control system"
DESCRIPTION="Git is a free and open source distributed version control system \
designed to handle everything from small to very large projects with speed \
and efficiency.
Git is easy to learn and has a tiny footprint with lightning fast performance. \
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-2020 Git Authors (see git web site for list)"
LICENSE="GNU GPL v2"
REVISION="3"
SOURCE_URI="https://www.kernel.org/pub/software/scm/git/git-$portVersion.tar.xz"
CHECKSUM_SHA256="41f7d90c71f9476cd387673fcb10ce09ccbed67332436a4cc58d7af32c355faa"
SOURCE_URI_2="https://www.kernel.org/pub/software/scm/git/git-manpages-$portVersion.tar.xz"
CHECKSUM_SHA256_2="5e64ace225e6dd0749b09c7adce765a538a922699c8997421ee255c3165e2aaa"
SOURCE_URI_3="https://www.kernel.org/pub/software/scm/git/git-htmldocs-$portVersion.tar.xz"
CHECKSUM_SHA256_3="29b8ab81966ec7c1a3ed47fb7fe23f0b78289c18d11d58c0dc8749613e0419dc"
PATCHES="git-$portVersion.patchset"
ARCHITECTURES="all"
GLOBAL_WRITABLE_FILES="
settings/gitconfig keep-old
"
USER_SETTINGS_FILES="
settings/git directory
"
PROVIDES="
git = $portVersion compat >= 2.3
cmd:git = $portVersion compat >= 2.3
cmd:git_receive_pack = $portVersion compat >= 2.3
cmd:git_shell = $portVersion compat >= 2.3
cmd:git_upload_archive = $portVersion compat >= 2.3
cmd:git_upload_pack = $portVersion compat >= 2.3
"
PROVIDES_arch="
git_arch = $portVersion compat >= 2.3
cmd:git_archimport = $portVersion compat >= 2.3
"
PROVIDES_cvs="
git_cvs = $portVersion compat >= 2.3
cmd:git_cvsimport = $portVersion compat >= 2.3
cmd:git_cvsserver = $portVersion compat >= 2.3
"
PROVIDES_daemon="
git_daemon = $portVersion compat >= 2.3
cmd:git_daemon = $portVersion compat >= 2.3
"
PROVIDES_email="
git_email = $portVersion compat >= 2.3
cmd:git_send_email = $portVersion compat >= 2.3
"
PROVIDES_gui="
git_gui = $portVersion compat >= 2.3
cmd:git_gui = $portVersion compat >= 2.3
cmd:gitk = $portVersion compat >= 2.3
"
PROVIDES_source="
git_source = $portVersion compat >= 2.3
"
PROVIDES_svn="
git_svn = $portVersion compat >= 2.3
cmd:git_svn = $portVersion compat >= 2.3
"
REQUIRES="
haiku
cmd:man
cmd:nano
cmd:perl >= 5
lib:libcurl
lib:libexpat
lib:libiconv
lib:libintl
lib:libpcre2_8
lib:libnghttp2
lib:libssl
lib:libz
vendor_perl
"
REQUIRES_arch="
haiku
git == $portVersion base
"
REQUIRES_cvs="
haiku
git == $portVersion base
cmd:cvsps
"
REQUIRES_daemon="
haiku
lib:libcrypto
lib:libiconv
lib:libintl
lib:libpcre2_8
lib:libz
git == $portVersion base
"
REQUIRES_email="
haiku
git == $portVersion base
"
REQUIRES_gui="
haiku
git == $portVersion base
cmd:wish
"
REQUIRES_svn="
haiku
alien_svn
git == $portVersion base
"
BUILD_REQUIRES="
haiku_devel
cmd:cmp
cmd:man
cmd:nano
cmd:perl
devel:libcurl
devel:libexpat
devel:libiconv
devel:libintl
devel:libnghttp2
devel:libpcre2_8
devel:libssl
devel:libz
"
BUILD_PREREQUIRES="
cmd:find
cmd:gcc
cmd:gettext
cmd:ld
cmd:make
cmd:msgfmt
cmd:sed
cmd:tar
"
TEST_REQUIRES="
cmd:diff
cmd:gawk
"
makeGit()
{
make prefix=$prefix \
bindir_relative=$relativeBinDir \
mandir=$manDir \
infodir=$infoDir \
gitexecdir=$libDir/git-core \
sharedir=$dataDir \
template_dir=$dataDir/git-core/templates \
htmldir=$docDir \
sysconfdir=$sysconfDir \
PTHREAD_LIBS= \
USE_LIBPCRE2=YesPlease \
NO_D_TYPE_IN_DIRENT=YesPlease \
NO_MEMMEM=YesPlease \
NO_MKSTEMPS=YesPlease \
NEEDS_LIBICONV=YesPlease \
NO_R_TO_GCC_LINKER=YesPlease \
GNU_ROFF=YesPlease \
PERL_PATH=/bin/perl \
NO_PYTHON=YesPlease \
OBJECT_CREATION_USES_RENAMES=YesPlease \
NO_CROSS_DIRECTORY_HARDLINKS=YesPlease \
NO_INSTALL_HARDLINKS=YesPlease \
HAVE_DEV_TTY=YesPlease \
DEFAULT_EDITOR=nano \
DEFAULT_HELP_FORMAT=web \
BASIC_LDFLAGS="-lnetwork -lbsd" \
CPPFLAGS="-D_POSIX_THREAD_SAFE_FUNCTIONS" \
"$@"
}
BUILD()
{
makeGit $jobArgs
makeGit strip
}
INSTALL()
{
makeGit install
# copy manpages
mkdir -p $manDir
cp -rd $sourceDir2/* $manDir/
# copy html documentation
htmlDir=$docDir
mkdir -p $htmlDir
cp -rd $sourceDir3/*.html $htmlDir/
# Default system-wide gitconfig. Settings in this file are only used
# if they are unset both for the repository and globally (global options
# are saved in the user settings file).
# core.untrackedCache caches enumeration of untracked files and uses an
# efficient method of determining whether the cache is out of date. This
# is filesystem-dependent, but supported on BeFS.
mkdir -p $sysconfDir
printf "[core]\n untrackedCache = true" > $sysconfDir/gitconfig
# replace copies of git binaries with symlinks
cd $binDir
for program in git*; do
if [ $program = "gitk" ]; then
continue
fi
ln -sfn "../lib/git-core/$program" "$program"
done
packageEntries arch \
documentation/packages/git/git-archimport.html \
documentation/man/man1/git-archimport.1 \
lib/git-core/git-archimport
packageEntries cvs \
bin/git-cvsserver \
documentation/packages/git/git-cvsexportcommit.html \
documentation/packages/git/git-cvsimport.html \
documentation/packages/git/git-cvsserver.html \
documentation/man/man1/git-cvsexportcommit.1 \
documentation/man/man1/git-cvsimport.1 \
documentation/man/man1/git-cvsserver.1 \
documentation/man/man7/gitcvs-migration.7 \
lib/git-core/git-cvsexportcommit \
lib/git-core/git-cvsimport \
lib/git-core/git-cvsserver
packageEntries daemon \
documentation/packages/git/git-credential-cache--daemon.html \
documentation/packages/git/git-credential-cache.html \
documentation/packages/git/git-daemon.html \
documentation/man/man1/git-credential-cache--daemon.1 \
documentation/man/man1/git-credential-cache.1 \
documentation/man/man1/git-daemon.1 \
lib/git-core/git-credential-cache--daemon \
lib/git-core/git-credential-cache \
lib/git-core/git-daemon
packageEntries email \
documentation/packages/git/git-send-email.html \
documentation/man/man1/git-send-email.1 \
lib/git-core/git-send-email
packageEntries gui \
documentation/packages/git/git-gui.html \
documentation/packages/git/gitk.html \
documentation/man/man1/git-gui.1 \
documentation/man/man1/gitk.1 \
data/gitk \
data/git-gui \
lib/git-core/git-gui \
lib/git-core/git-gui--askpass \
lib/git-core/git-citool \
bin/gitk
packageEntries svn \
documentation/packages/git/git-svn.html \
documentation/man/man1/git-svn.1 \
lib/git-core/git-svn
}
TEST()
{
# x86_64
#failed test(s): t0005 t0006 t0210 t0211 t0301 t0302 t1060 t1100 t1300 t1306 t1308 t1309 t2400 t3903 t5000 t5300 t5506 t5521 t5562 t5604 t5605 t5702 t5814 t7060 t7300 t7415 t7701 t7800 t9300
#fixed 1
#success 21670
#failed 78
#broken 236
#total 22417
# x86_gcc2
#failed test(s): t0005 t0006 t0210 t0211 t0301 t0302 t1060 t1100 t1300 t1306 t1308 t1309 t2400 t3903 t4014 t5150 t5300 t5400 t5516 t5528 t5531 t5562 t5604 t5605 t5702 t5814 t6430 t7060 t7300 t7409 t7415 t7701 t7800 t9300
#fixed 1
#success 21651
#failed 90
#broken 236
#total 22417
cat << DONE
!!Make sure to configure the debug_server in \
~/config/settings/system/debug_server/settings:
executable_actions {
/sources/git-* kill
}
DONE
makeGit test
}

View File

@@ -1,305 +0,0 @@
SUMMARY="Fast, scalable, distributed revision control system"
DESCRIPTION="Git is a free and open source distributed version control system \
designed to handle everything from small to very large projects with speed \
and efficiency.
Git is easy to learn and has a tiny footprint with lightning fast performance. \
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-2020 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="814641d7f61659cfbc17825d0462499ca1403e39ff53d76a8512050e6483e87a"
SOURCE_URI_2="https://www.kernel.org/pub/software/scm/git/git-manpages-$portVersion.tar.xz"
CHECKSUM_SHA256_2="9c5373549ae6131d4fc7bc04f6e064e33f5038710aacfb65c95e78e479927414"
SOURCE_URI_3="https://www.kernel.org/pub/software/scm/git/git-htmldocs-$portVersion.tar.xz"
CHECKSUM_SHA256_3="abbc43fe994622bc414d4d1282a84ebe665e49fe03ea944a67a9b905821874c2"
PATCHES="git-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
GLOBAL_WRITABLE_FILES="
settings/gitconfig keep-old
"
USER_SETTINGS_FILES="
settings/git directory
"
PROVIDES="
git$secondaryArchSuffix = $portVersion compat >= 2.3
cmd:git = $portVersion compat >= 2.3
cmd:git_receive_pack = $portVersion compat >= 2.3
cmd:git_shell = $portVersion compat >= 2.3
cmd:git_upload_archive = $portVersion compat >= 2.3
cmd:git_upload_pack = $portVersion compat >= 2.3
"
if [ "$targetArchitecture" = x86_gcc2 ]; then
REPLACES="
git
"
fi
PROVIDES_arch="
git${secondaryArchSuffix}_arch = $portVersion compat >= 2.3
cmd:git_archimport = $portVersion compat >= 2.3
"
PROVIDES_cvs="
git${secondaryArchSuffix}_cvs = $portVersion compat >= 2.3
cmd:git_cvsimport = $portVersion compat >= 2.3
cmd:git_cvsserver = $portVersion compat >= 2.3
"
PROVIDES_daemon="
git${secondaryArchSuffix}_daemon = $portVersion compat >= 2.3
cmd:git_daemon = $portVersion compat >= 2.3
"
PROVIDES_email="
git${secondaryArchSuffix}_email = $portVersion compat >= 2.3
cmd:git_send_email = $portVersion compat >= 2.3
"
PROVIDES_gui="
git${secondaryArchSuffix}_gui = $portVersion compat >= 2.3
cmd:git_gui = $portVersion compat >= 2.3
cmd:gitk = $portVersion compat >= 2.3
"
PROVIDES_source="
git${secondaryArchSuffix}_source = $portVersion compat >= 2.3
"
PROVIDES_svn="
git${secondaryArchSuffix}_svn = $portVersion compat >= 2.3
cmd:git_svn = $portVersion compat >= 2.3
"
if [ "$targetArchitecture" = x86_gcc2 ]; then
for pkg in arch cvs daemon email gui source svn; do eval "REPLACES_${pkg}=git_${pkg}"; done
fi
REQUIRES="
haiku$secondaryArchSuffix
cmd:man
cmd:nano
cmd:perl >= 5
lib:libcurl$secondaryArchSuffix
lib:libexpat$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
lib:libpcre2_8$secondaryArchSuffix
lib:libnghttp2$secondaryArchSuffix
lib:libssl$secondaryArchSuffix
lib:libz$secondaryArchSuffix
vendor_perl
"
REQUIRES_arch="
haiku$secondaryArchSuffix
git$secondaryArchSuffix == $portVersion base
"
REQUIRES_cvs="
haiku$secondaryArchSuffix
git$secondaryArchSuffix == $portVersion base
cmd:cvsps
"
REQUIRES_daemon="
haiku$secondaryArchSuffix
lib:libcrypto$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
lib:libpcre2_8$secondaryArchSuffix
lib:libz$secondaryArchSuffix
git$secondaryArchSuffix == $portVersion base
"
REQUIRES_email="
haiku$secondaryArchSuffix
git$secondaryArchSuffix == $portVersion base
"
REQUIRES_gui="
haiku$secondaryArchSuffix
git$secondaryArchSuffix == $portVersion base
cmd:wish
"
REQUIRES_svn="
haiku$secondaryArchSuffix
alien_svn
git$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
cmd:cmp
cmd:man
cmd:nano
cmd:perl
devel:libcurl$secondaryArchSuffix
devel:libexpat$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix
devel:libintl$secondaryArchSuffix
devel:libnghttp2$secondaryArchSuffix
devel:libpcre2_8$secondaryArchSuffix
devel:libssl$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:find
cmd:gcc$secondaryArchSuffix
cmd:gettext
cmd:ld$secondaryArchSuffix
cmd:make
cmd:msgfmt
cmd:sed
cmd:tar
"
TEST_REQUIRES="
cmd:diff
cmd:gawk
"
makeGit()
{
make prefix=$prefix \
bindir_relative=$relativeBinDir \
mandir=$manDir \
infodir=$infoDir \
gitexecdir=$libDir/git-core \
sharedir=$dataDir \
template_dir=$dataDir/git-core/templates \
htmldir=$docDir \
sysconfdir=$sysconfDir \
PTHREAD_LIBS= \
USE_LIBPCRE2=YesPlease \
NO_D_TYPE_IN_DIRENT=YesPlease \
NO_MEMMEM=YesPlease \
NO_MKSTEMPS=YesPlease \
NEEDS_LIBICONV=YesPlease \
NO_R_TO_GCC_LINKER=YesPlease \
GNU_ROFF=YesPlease \
PERL_PATH=/bin/perl \
NO_PYTHON=YesPlease \
OBJECT_CREATION_USES_RENAMES=YesPlease \
NO_CROSS_DIRECTORY_HARDLINKS=YesPlease \
NO_INSTALL_HARDLINKS=YesPlease \
HAVE_DEV_TTY=YesPlease \
DEFAULT_EDITOR=nano \
DEFAULT_HELP_FORMAT=web \
BASIC_LDFLAGS="-lnetwork -lbsd" \
CPPFLAGS="-D_POSIX_THREAD_SAFE_FUNCTIONS" \
"$@"
}
BUILD()
{
makeGit $jobArgs
makeGit strip
}
INSTALL()
{
makeGit install
# copy manpages
mkdir -p $manDir
cp -rd $sourceDir2/* $manDir/
# copy html documentation
htmlDir=$docDir
mkdir -p $htmlDir
cp -rd $sourceDir3/*.html $htmlDir/
# Default system-wide gitconfig. Settings in this file are only used
# if they are unset both for the repository and globally (global options
# are saved in the user settings file).
# core.untrackedCache caches enumeration of untracked files and uses an
# efficient method of determining whether the cache is out of date. This
# is filesystem-dependent, but supported on BeFS.
mkdir -p $sysconfDir
printf "[core]\n untrackedCache = true" > $sysconfDir/gitconfig
# replace copies of git binaries with symlinks
cd $prefix/bin
for program in git*; do
if [ $program = "gitk" ]; then
continue
fi
ln -sfn "$libDir/git-core/$program" "$program"
done
packageEntries arch \
$docDir/git-archimport.html \
$manDir/man1/git-archimport.1 \
$libDir/git-core/git-archimport
packageEntries cvs \
$prefix/bin/git-cvsserver \
$docDir/git-cvsexportcommit.html \
$docDir/git-cvsimport.html \
$docDir/git-cvsserver.html \
$manDir/man1/git-cvsexportcommit.1 \
$manDir/man1/git-cvsimport.1 \
$manDir/man1/git-cvsserver.1 \
$manDir/man7/gitcvs-migration.7 \
$libDir/git-core/git-cvsexportcommit \
$libDir/git-core/git-cvsimport \
$libDir/git-core/git-cvsserver
packageEntries daemon \
$docDir/git-credential-cache--daemon.html \
$docDir/git-credential-cache.html \
$docDir/git-daemon.html \
$manDir/man1/git-credential-cache--daemon.1 \
$manDir/man1/git-credential-cache.1 \
$manDir/man1/git-daemon.1 \
$libDir/git-core/git-credential-cache--daemon \
$libDir/git-core/git-credential-cache \
$libDir/git-core/git-daemon
packageEntries email \
$docDir/git-send-email.html \
$manDir/man1/git-send-email.1 \
$libDir/git-core/git-send-email
packageEntries gui \
$docDir/git-gui.html \
$docDir/gitk.html \
$manDir/man1/git-gui.1 \
$manDir/man1/gitk.1 \
$dataDir/gitk \
$dataDir/git-gui \
$libDir/git-core/git-gui \
$libDir/git-core/git-gui--askpass \
$libDir/git-core/git-citool \
$prefix/bin/gitk
packageEntries svn \
$docDir/git-svn.html \
$manDir/man1/git-svn.1 \
$libDir/git-core/git-svn
}
TEST()
{
# x86_64
#failed test(s): t0005 t0006 t0210 t0211 t0301 t0302 t1060 t1100 t1300 t1306 t1308 t1309 t2400 t3903 t5000 t5300 t5506 t5521 t5562 t5604 t5605 t5702 t5814 t7060 t7300 t7415 t7701 t7800 t9300
#fixed 1
#success 21670
#failed 78
#broken 236
#total 22417
# x86_gcc2
#failed test(s): t0005 t0006 t0210 t0211 t0301 t0302 t1060 t1100 t1300 t1306 t1308 t1309 t2400 t3903 t4014 t5150 t5300 t5400 t5516 t5528 t5531 t5562 t5604 t5605 t5702 t5814 t6430 t7060 t7300 t7409 t7415 t7701 t7800 t9300
#fixed 1
#success 21651
#failed 90
#broken 236
#total 22417
cat << DONE
!!Make sure to configure the debug_server in \
~/config/settings/system/debug_server/settings:
executable_actions {
/sources/git-* kill
}
DONE
makeGit test
}

View File

@@ -1,249 +0,0 @@
From 7e7db2bdf066f19fa006f30ff21daf2c35624f6a Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Tue, 13 Aug 2013 08:07:25 +0200
Subject: git-web--browse.sh: use "open" on Haiku
diff --git a/git-web--browse.sh b/git-web--browse.sh
index ae15253..b074d1a 100755
--- a/git-web--browse.sh
+++ b/git-web--browse.sh
@@ -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.30.2
From 1173ccfc8391460ba2c19135ca8f705b82d16f57 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
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 7b385e5..f0669d6 100644
--- a/path.c
+++ b/path.c
@@ -13,6 +13,11 @@
#include "object-store.h"
#include "lockfile.h"
+#ifdef __HAIKU__
+#include <FindDirectory.h>
+#include <StorageDefs.h>
+#endif
+
static int get_st_mode_bits(const char *path, int *mode)
{
struct stat st;
@@ -1502,10 +1507,19 @@ char *xdg_config_home(const char *filename)
{
const char *home, *config_home;
+#ifdef __HAIKU__
+ char settingsPath[B_PATH_NAME_LENGTH];
+ assert(filename);
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, true, settingsPath,
+ sizeof(settingsPath)) == B_OK)
+ return mkpathdup("%s/git/%s", settingsPath, filename);
+#else
assert(filename);
config_home = getenv("XDG_CONFIG_HOME");
+
if (config_home && *config_home)
return mkpathdup("%s/git/%s", config_home, filename);
+#endif
home = getenv("HOME");
if (home)
--
2.30.2
From 3da701076a44b5aad208bbcc2f589a1a59894606 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
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 1137bd7..14cd935 100644
--- a/config.c
+++ b/config.c
@@ -2777,6 +2777,14 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
if (!config_filename)
config_filename = filename_buf = git_pathdup("config");
+ if (find_last_dir_sep(config_filename) != NULL) {
+ char *config_dir = xstrdup(config_filename);
+ * find_last_dir_sep(config_dir) = '\0';
+ if (access(config_dir, F_OK) != 0)
+ mkdir(config_dir, 0755);
+ free(config_dir);
+ }
+
/*
* The lock serves a purpose in addition to locking: the new
* contents of .git/config will be written into it.
--
2.30.2
From 6a1b7b987bc0ce2448f4f8e31688b947f414f27e Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
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/builtin/credential-cache.c b/builtin/credential-cache.c
index 9b3f709..893db81 100644
--- a/builtin/credential-cache.c
+++ b/builtin/credential-cache.c
@@ -90,7 +90,7 @@ static char *get_socket_path(void)
{
struct stat sb;
char *old_dir, *socket;
- old_dir = expand_user_path("~/.git-credential-cache", 0);
+ old_dir = xdg_config_home("credential-cache");
if (old_dir && !stat(old_dir, &sb) && S_ISDIR(sb.st_mode))
socket = xstrfmt("%s/socket", old_dir);
else
--
2.30.2
From 067bbb03f2435533c92f8d29bdf6e72208ab4f85 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 f71fa39..0843a19 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -674,24 +674,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"));
-
- given_config_source.scope = CONFIG_SCOPE_GLOBAL;
-
- 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.30.2
From 07b60aae359b18135125a44c3fea15e1ecb661c8 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 18 Nov 2018 11:56:26 +0100
Subject: Fix detection of Haiku for git web browse
The bootloader was renamed, so it is not a reliable thing to use. Detect
the BEINCLUDES environment variable instead.
diff --git a/git-web--browse.sh b/git-web--browse.sh
index b074d1a..0f95000 100755
--- a/git-web--browse.sh
+++ b/git-web--browse.sh
@@ -133,8 +133,8 @@ 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
+ # BEINCLUDES indicates Haiku
+ if test -n "$BEINCLUDES"; then
browser_candidates="open $browser_candidates"
fi
--
2.30.2
From 6f22d769e9097a01055f2020cb9941e784b930a7 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 29 Nov 2019 21:46:54 +0100
Subject: ignore test failures.
diff --git a/t/Makefile b/t/Makefile
index 882d26e..3252f7f 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -54,7 +54,7 @@ prove: pre-clean check-chainlint $(TEST_LINT)
$(MAKE) clean-except-prove-cache
$(T):
- @echo "*** $@ ***"; '$(TEST_SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
+ - @echo "*** $@ ***"; '$(TEST_SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
pre-clean:
$(RM) -r '$(TEST_RESULTS_DIRECTORY_SQ)'
--
2.30.2
From 82e4176ded57dbc776d038ae917b6f76f869eb89 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Wed, 17 Nov 2021 18:11:17 -0500
Subject: git-gui: Use symbolic links.
diff --git a/git-gui/Makefile b/git-gui/Makefile
index 56c85a8..4b3e8eb 100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -59,7 +59,7 @@ INSTALL_X1 =
INSTALL_A0 = find # space is required here
INSTALL_A1 = | cpio -pud
INSTALL_L0 = rm -f # space is required here
-INSTALL_L1 = && ln # space is required here
+INSTALL_L1 = && ln -s # space is required here
INSTALL_L2 =
INSTALL_L3 =
@@ -89,7 +89,7 @@ ifndef V
INSTALL_L0 = dst=
INSTALL_L1 = && src=
INSTALL_L2 = && dst=
- INSTALL_L3 = && echo ' ' 'LINK ' `basename "$$dst"` '->' `basename "$$src"` && rm -f "$$dst" && ln "$$src" "$$dst"
+ INSTALL_L3 = && echo ' ' 'LINK ' `basename "$$dst"` '->' `basename "$$src"` && rm -f "$$dst" && ln -s "$$src" "$$dst"
CLEAN_DST = echo ' ' UNINSTALL
REMOVE_D0 = dir=
--
2.30.2

View File

@@ -1,250 +0,0 @@
From 7e7db2bdf066f19fa006f30ff21daf2c35624f6a Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Tue, 13 Aug 2013 08:07:25 +0200
Subject: git-web--browse.sh: use "open" on Haiku
diff --git a/git-web--browse.sh b/git-web--browse.sh
index ae15253..b074d1a 100755
--- a/git-web--browse.sh
+++ b/git-web--browse.sh
@@ -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.30.2
From 1173ccfc8391460ba2c19135ca8f705b82d16f57 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
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 2c89547..e1be0dd 100644
--- a/path.c
+++ b/path.c
@@ -14,6 +14,11 @@
#include "lockfile.h"
#include "exec-cmd.h"
+#ifdef __HAIKU__
+#include <FindDirectory.h>
+#include <StorageDefs.h>
+#endif
+
static int get_st_mode_bits(const char *path, int *mode)
{
struct stat st;
@@ -1514,11 +1519,19 @@ char *xdg_config_home_for(const char *subdir, const char *filename)
{
const char *home, *config_home;
+#ifdef __HAIKU__
+ char settingsPath[B_PATH_NAME_LENGTH];
+ assert(filename);
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, true, settingsPath,
+ sizeof(settingsPath)) == B_OK)
+ return mkpathdup("%s/git/%s", settingsPath, filename);
+#else
assert(subdir);
assert(filename);
config_home = getenv("XDG_CONFIG_HOME");
if (config_home && *config_home)
return mkpathdup("%s/%s/%s", config_home, subdir, filename);
+#endif
home = getenv("HOME");
if (home)
--
2.30.2
From 3da701076a44b5aad208bbcc2f589a1a59894606 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
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 2bffa8d..d5801bb 100644
--- a/config.c
+++ b/config.c
@@ -2941,6 +2941,14 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
if (!config_filename)
config_filename = filename_buf = git_pathdup("config");
+ if (find_last_dir_sep(config_filename) != NULL) {
+ char *config_dir = xstrdup(config_filename);
+ * find_last_dir_sep(config_dir) = '\0';
+ if (access(config_dir, F_OK) != 0)
+ mkdir(config_dir, 0755);
+ free(config_dir);
+ }
+
/*
* The lock serves a purpose in addition to locking: the new
* contents of .git/config will be written into it.
--
2.30.2
From 6a1b7b987bc0ce2448f4f8e31688b947f414f27e Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
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/builtin/credential-cache.c b/builtin/credential-cache.c
index 78c02ad..fc0cfa6 100644
--- a/builtin/credential-cache.c
+++ b/builtin/credential-cache.c
@@ -116,7 +116,7 @@ static char *get_socket_path(void)
{
struct stat sb;
char *old_dir, *socket;
- old_dir = interpolate_path("~/.git-credential-cache", 0);
+ old_dir = xdg_config_home("credential-cache");
if (old_dir && !stat(old_dir, &sb) && S_ISDIR(sb.st_mode))
socket = xstrfmt("%s/socket", old_dir);
else
--
2.30.2
From 067bbb03f2435533c92f8d29bdf6e72208ab4f85 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 542d8d0..0e50fd6 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -674,24 +674,11 @@ int cmd_config(int argc, const char **argv, const char *prefix)
char *user_config, *xdg_config;
git_global_config(&user_config, &xdg_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"));
-
- given_config_source.scope = CONFIG_SCOPE_GLOBAL;
-
- 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.30.2
From 07b60aae359b18135125a44c3fea15e1ecb661c8 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 18 Nov 2018 11:56:26 +0100
Subject: Fix detection of Haiku for git web browse
The bootloader was renamed, so it is not a reliable thing to use. Detect
the BEINCLUDES environment variable instead.
diff --git a/git-web--browse.sh b/git-web--browse.sh
index b074d1a..0f95000 100755
--- a/git-web--browse.sh
+++ b/git-web--browse.sh
@@ -133,8 +133,8 @@ 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
+ # BEINCLUDES indicates Haiku
+ if test -n "$BEINCLUDES"; then
browser_candidates="open $browser_candidates"
fi
--
2.30.2
From 6f22d769e9097a01055f2020cb9941e784b930a7 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 29 Nov 2019 21:46:54 +0100
Subject: ignore test failures.
diff --git a/t/Makefile b/t/Makefile
index 46cd5fc..6500c3f 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -54,7 +54,7 @@ prove: pre-clean check-chainlint $(TEST_LINT)
$(MAKE) clean-except-prove-cache
$(T):
- @echo "*** $@ ***"; '$(TEST_SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
+ - @echo "*** $@ ***"; '$(TEST_SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
pre-clean:
$(RM) -r '$(TEST_RESULTS_DIRECTORY_SQ)'
--
2.30.2
From 82e4176ded57dbc776d038ae917b6f76f869eb89 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Wed, 17 Nov 2021 18:11:17 -0500
Subject: git-gui: Use symbolic links.
diff --git a/git-gui/Makefile b/git-gui/Makefile
index 56c85a8..4b3e8eb 100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -59,7 +59,7 @@ INSTALL_X1 =
INSTALL_A0 = find # space is required here
INSTALL_A1 = | cpio -pud
INSTALL_L0 = rm -f # space is required here
-INSTALL_L1 = && ln # space is required here
+INSTALL_L1 = && ln -s # space is required here
INSTALL_L2 =
INSTALL_L3 =
@@ -89,7 +89,7 @@ ifndef V
INSTALL_L0 = dst=
INSTALL_L1 = && src=
INSTALL_L2 = && dst=
- INSTALL_L3 = && echo ' ' 'LINK ' `basename "$$dst"` '->' `basename "$$src"` && rm -f "$$dst" && ln "$$src" "$$dst"
+ INSTALL_L3 = && echo ' ' 'LINK ' `basename "$$dst"` '->' `basename "$$src"` && rm -f "$$dst" && ln -s "$$src" "$$dst"
CLEAN_DST = echo ' ' UNINSTALL
REMOVE_D0 = dir=
--
2.30.2