diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-10-10 16:03:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-10 16:03:43 -0700 |
| commit | b12bbd5986e1fae4120d7a415c1271c0273cad7e (patch) | |
| tree | 4d00a9874001944444ade975ba9a54e777bbec5c | |
| parent | cc1621e2a02ed2a408571ed6f6ba84de2166e334 (diff) | |
| parent | 18e410f1eaaf8e3e82dca9f124782b099ead7612 (diff) | |
| download | git-b12bbd5986e1fae4120d7a415c1271c0273cad7e.tar.gz | |
Merge branch 'fixes'
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Makefile | 1 | ||||
| -rwxr-xr-x | git-status.sh | 8 | ||||
| -rwxr-xr-x | git.sh | 7 | ||||
| -rwxr-xr-x | t/t5400-send-pack.sh | 3 | ||||
| -rwxr-xr-x | t/test-lib.sh | 3 |
5 files changed, 14 insertions, 8 deletions
@@ -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 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" @@ -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 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 |