undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fixes'

Browse Source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-10-10 16:03:43 -07:00
commit b12bbd5986
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -202,6 +202,7 @@ ifeq ($(uname_O),Cygwin)
PLATFORM_DEFINES += -DUSE_SYMLINK_HEAD=0 PLATFORM_DEFINES += -DUSE_SYMLINK_HEAD=0
endif endif
ifeq ($(uname_S),OpenBSD) ifeq ($(uname_S),OpenBSD)
NO_STRCASESTR = YesPlease
NEEDS_LIBICONV = YesPlease NEEDS_LIBICONV = YesPlease
PLATFORM_DEFINES += -I/usr/local/include -L/usr/local/lib PLATFORM_DEFINES += -I/usr/local/include -L/usr/local/lib
endif endif

8
git-status.sh
View File

@ -45,10 +45,10 @@ then
sed -e ' sed -e '
s/^:// s/^://
h h
s/^[^\t]*// s/^[^ ]*//
s/ /\\ /g s/ /\\ /g
x x
s/\t.*$// s/ .*$//
G G
s/\n/ /' | s/\n/ /' |
report "Updated but not checked in" "will commit" report "Updated but not checked in" "will commit"
@ -71,10 +71,10 @@ git-diff-files |
sed -e ' sed -e '
s/^:// s/^://
h h
s/^[^\t]*// s/^[^ ]*//
s/ /\\ /g s/ /\\ /g
x x
s/\t.*$// s/ .*$//
G G
s/\n/ /' | s/\n/ /' |
report "Changed but not updated" "use git-update-index to mark for commit" report "Changed but not updated" "use git-update-index to mark for commit"

7
git.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
cmd= cmd=
path=$(dirname $0) path=$(dirname "$0")
case "$#" in case "$#" in
0) ;; 0) ;;
*) cmd="$1" *) cmd="$1"
@ -12,13 +12,14 @@ case "$#" in
exit 0 ;; exit 0 ;;
esac esac
test -x $path/git-$cmd && exec $path/git-$cmd "$@" test -x "$path/git-$cmd" && exec "$path/git-$cmd" "$@"
case '@@X@@' in 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 esac
;; ;;

3
t/t5400-send-pack.sh
View File

@ -8,6 +8,9 @@ test_description='See why rewinding head breaks send-pack
' '
. ./test-lib.sh . ./test-lib.sh
touch cpio-test
test_expect_success 'working cpio' 'echo cpio-test | cpio -o > /dev/null'
cnt='1' cnt='1'
test_expect_success setup ' test_expect_success setup '
tree=$(git-write-tree) && tree=$(git-write-tree) &&

3
t/test-lib.sh
View File

@ -5,9 +5,10 @@
# For repeatability, reset the environment to known value. # For repeatability, reset the environment to known value.
LANG=C LANG=C
LC_ALL=C
PAGER=cat PAGER=cat
TZ=UTC TZ=UTC
export LANG PAGER TZ export LANG LC_ALL PAGER TZ
unset AUTHOR_DATE unset AUTHOR_DATE
unset AUTHOR_EMAIL unset AUTHOR_EMAIL
unset AUTHOR_NAME unset AUTHOR_NAME