Revert "Hardlinks are not supported in MSys so we disable them."

This reverts commit d1f83218dc.

Hardlinks are supported by MSYS (on NTFS).

Conflicts:

	Makefile
	git-clone.sh
	t/Makefile
	t/test-lib.sh

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
This commit is contained in:
Steffen Prohaska
2007-12-30 16:04:05 +01:00
parent 24fcae02c3
commit 96ddc42f70
5 changed files with 2 additions and 29 deletions

View File

@@ -54,9 +54,6 @@ all::
# Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link.
# Enable it on Windows. By default, symrefs are still used.
#
# Define NO_HARDLINKS if you want to disable hard linking in git clone.
# Enable it on Windows.
#
# Define NO_SVN_TESTS if you want to skip time-consuming SVN interoperability
# tests. These tests take up a significant amount of the total test time
# but are not needed unless you plan to talk to SVN repos.
@@ -544,7 +541,6 @@ ifneq (,$(findstring MINGW,$(uname_S)))
NO_PREAD = YesPlease
NO_OPENSSL = YesPlease
NO_SYMLINK_HEAD = YesPlease
NO_HARDLINKS = YesPlease
NO_IPV6 = YesPlease
NO_SETENV = YesPlease
NO_UNSETENV = YesPlease
@@ -841,10 +837,6 @@ ifdef ASCIIDOC8
export ASCIIDOC8
endif
ifdef NO_HARDLINKS
export NO_HARDLINKS
endif
# Shell quote (do not use $(call) to accommodate ancient setups);
SHA1_HEADER_SQ = $(subst ','\'',$(SHA1_HEADER))
@@ -923,7 +915,7 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
-e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
-e 's/@@NO_CURL@@/$(NO_CURL)/g' \
-e 's/@@NO_HARDLINKS@@/$(NO_HARDLINKS)/g' \
-e 's|@@HTMLDIR@@|$(htmldir_SQ)|g' \
$@.sh >$@+ && \
chmod +x $@+ && \
mv $@+ $@

View File

@@ -176,7 +176,7 @@ origin_override=
use_separate_remote=t
depth=
no_progress=
test "@@NO_HARDLINKS@@" && use_local_hardlink=no
local_explicitly_asked_for=
test -t 1 || no_progress=--no-progress
while test $# != 0
@@ -188,8 +188,6 @@ do
bare=yes ;;
-l|--local)
local_explicitly_asked_for=yes
(test "@@NO_HARDLINKS@@" &&
echo >&2 "Warning: -l asked but hardlinks are not supported") ||
use_local_hardlink=yes
;;
--no-hardlinks)

View File

@@ -14,10 +14,6 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
TSVN = $(wildcard t91[0-9][0-9]-*.sh)
ifdef NO_HARDLINKS
GIT_TEST_OPTS += --no-hardlinks
endif
all: $(T) clean
$(T):

View File

@@ -3,13 +3,6 @@
test_description='test local clone'
. ./test-lib.sh
if test "$no_hardlinks"
then
say 'Hard links not supported, skipping tests.'
test_done
exit
fi
D=`pwd`
test_expect_success 'preparing origin repository' '
@@ -66,10 +59,6 @@ test_expect_success 'With -no-hardlinks, local will make a copy' '
test 0 = $linked
'
say "hardlinks not supported, skipping tests."
test_done
exit 0
test_expect_success 'Even without -l, local will make a hardlink' '
cd "$D" &&
rm -fr w &&

View File

@@ -91,8 +91,6 @@ do
--no-python)
# noop now...
shift ;;
--no-hardlinks)
no_hardlinks=t; shift ;;
*)
break ;;
esac