From: Junio C Hamano <junkio@cox.net>
Date: Mon, 10 Oct 2005 23:17:02 +0000 (-0700)
Subject: Merge branch 'fixes'
X-Git-Tag: v0.99.8d~9
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/e858862fd967f5d51b0730f8750a49c6acedea3e?hp=32e49d5d1ccbc4833b0c6f30d6dfc0f0936cc3f3

Merge branch 'fixes'
---

diff --git a/Makefile b/Makefile
index 6843366994..39d13613ad 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
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"
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]"
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) &&
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