mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'fixes'
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
commit
b12bbd5986
1
Makefile
1
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
|
||||
|
|
|
@ -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"
|
||||
|
|
7
git.sh
7
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
|
||||
;;
|
||||
|
|
|
@ -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) &&
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue