Merge branch 'fixes'

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Makefile b/Makefile
index f7eee4708a5df439c5a39d4b3fae6ebc9baa4d4c..0ca8e8d270d4a07c41728d9b09de9538fe5cc714 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -202,6 +202,7 @@ ifeq ($(uname_O),Cygwin)
        PLATFORM_DEFINES += -DUSE_SYMLINK_HEAD=0
 endif
 ifeq ($(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 6e2783a7b4df7ec77aa4d472e84db323f65ecc83..fbdd377539eea2c4521a2df2d37ff06b80567664 100755 (executable)
--- 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 7400c162578c5e18a2a406b09263394e485e0990..94940aea28a45294126b9065e09017ae302e7a51 100755 (executable)
--- a/git.sh
+++ b/git.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 cmd=
-path=$(dirname $0)
+path=$(dirname "$0")
 case "$#" in
 0)     ;;
 *)     cmd="$1"
@@ -12,13 +12,14 @@ case "$#" in
                exit 0 ;;
        esac
        
-       test -x $path/git-$cmd && exec $path/git-$cmd "$@"
+       test -x "$path/git-$cmd" && exec "$path/git-$cmd" "$@"
        
        case '@@X@@' in
            '')
                ;;
            *)
-               test -x $path/git-$cmd@@X@@ && exec $path/git-$cmd@@X@@ "$@"
+               test -x "$path/git-$cmd@@X@@" &&
+               exec "$path/git-$cmd@@X@@" "$@"
                ;;
        esac
        ;;

diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 1a4d2f2f13d4875d92e94cfa686ac42d3556ee24..7fc3bd7d3e9c7761a1c64073be95129d3e93bae8 100755 (executable)
--- 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 1523d2ebbf1f355fe60ad0d5ef948d24cebc85ad..3f8a6fe4145e673e77fd6e18548a5622a5c0400e 100755 (executable)
--- 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