From 899460f336254a128602b86ca48433a983dced72 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 9 Oct 2005 21:58:02 -0700 Subject: [PATCH 1/5] Also force LC_ALL in test scripts. Noticed by Junichi Uekawa. Signed-off-by: Junio C Hamano --- t/test-lib.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index 1523d2ebbf..3f8a6fe414 100755 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -5,9 +5,10 @@ # For repeatability, reset the environment to known value. LANG=C +LC_ALL=C PAGER=cat TZ=UTC -export LANG PAGER TZ +export LANG LC_ALL PAGER TZ unset AUTHOR_DATE unset AUTHOR_EMAIL unset AUTHOR_NAME From 5fb41e8abf29a4c24b8e9e95277cfad349a4d1da Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 10 Oct 2005 11:51:11 -0700 Subject: [PATCH 2/5] OpenBSD needs the strcasestr replacement. Noticed by Randal L. Schwartz. Signed-off-by: Junio C Hamano --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index b8ca504f09..e67d0e7822 100644 --- a/Makefile +++ b/Makefile @@ -180,6 +180,7 @@ ifneq (,$(findstring arm,$(shell uname -m))) ARM_SHA1 = YesPlease endif ifeq ($(shell uname -s),OpenBSD) + NO_STRCASESTR = YesPlease NEEDS_LIBICONV = YesPlease PLATFORM_DEFINES += -I/usr/local/include -L/usr/local/lib endif From d52920e397918fdba0b0ac0bc46633fab807e681 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 10 Oct 2005 13:58:52 -0700 Subject: [PATCH 3/5] Teach git-status about spaces in file names also on MacOSX Not all sed understands '\t' and consequently cuts off every file name at the first "t" (or backslash...). Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- git-status.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/git-status.sh b/git-status.sh index 6e2783a7b4..fbdd377539 100755 --- a/git-status.sh +++ b/git-status.sh @@ -45,10 +45,10 @@ then sed -e ' s/^:// h - s/^[^\t]*// + s/^[^ ]*// s/ /\\ /g x - s/\t.*$// + s/ .*$// G s/\n/ /' | report "Updated but not checked in" "will commit" @@ -71,10 +71,10 @@ git-diff-files | sed -e ' s/^:// h - s/^[^\t]*// + s/^[^ ]*// s/ /\\ /g x - s/\t.*$// + s/ .*$// G s/\n/ /' | report "Changed but not updated" "use git-update-index to mark for commit" From d9c74a808e988146edd1f4ae463285554cb024bd Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Mon, 10 Oct 2005 14:14:06 -0700 Subject: [PATCH 4/5] git.sh: quote all paths This makes it handle spaces in paths. Signed-off-by: Jonas Fonseca Signed-off-by: Junio C Hamano --- git.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git.sh b/git.sh index dc383eddea..1c73ca1c20 100755 --- a/git.sh +++ b/git.sh @@ -1,7 +1,7 @@ #!/bin/sh cmd= -path=$(dirname $0) +path=$(dirname "$0") case "$#" in 0) ;; *) cmd="$1" @@ -11,7 +11,7 @@ case "$#" in echo "git version @@GIT_VERSION@@" exit 0 ;; esac - test -x $path/git-$cmd && exec $path/git-$cmd "$@" ;; + test -x "$path/git-$cmd" && exec "$path/git-$cmd" "$@" ;; esac echo "Usage: git COMMAND [OPTIONS] [TARGET]" From 18e410f1eaaf8e3e82dca9f124782b099ead7612 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 10 Oct 2005 14:14:22 -0700 Subject: [PATCH 5/5] t5400-send-pack relies on a working cpio Since cygwin does not install cpio by default, t5400 results in a very cryptic failure. So, test for cpio explicitely. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- t/t5400-send-pack.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh index 1a4d2f2f13..7fc3bd7d3e 100755 --- a/t/t5400-send-pack.sh +++ b/t/t5400-send-pack.sh @@ -8,6 +8,9 @@ test_description='See why rewinding head breaks send-pack ' . ./test-lib.sh +touch cpio-test +test_expect_success 'working cpio' 'echo cpio-test | cpio -o > /dev/null' + cnt='1' test_expect_success setup ' tree=$(git-write-tree) &&