Permalink
Browse files

Merge branch 'fixes'

  • Loading branch information...
Junio C Hamano
Junio C Hamano committed Oct 10, 2005
2 parents 32e49d5 + 18e410f commit e858862fd967f5d51b0730f8750a49c6acedea3e
Showing with 12 additions and 7 deletions.
  1. +1 −0 Makefile
  2. +4 −4 git-status.sh
  3. +2 −2 git.sh
  4. +3 −0 t/t5400-send-pack.sh
  5. +2 −1 t/test-lib.sh
View
@@ -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
View
@@ -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"
View
4 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]"
View
@@ -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) &&
View
@@ -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

0 comments on commit e858862

Please sign in to comment.