From: Junio C Hamano <junkio@cox.net>
Date: Mon, 10 Oct 2005 23:03:43 +0000 (-0700)
Subject: Merge branch 'fixes'
X-Git-Tag: v0.99.9~162
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b12bbd5986e1fae4120d7a415c1271c0273cad7e;p=git.git

Merge branch 'fixes'

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

b12bbd5986e1fae4120d7a415c1271c0273cad7e
diff --cc Makefile
index f7eee4708,e67d0e782..0ca8e8d27
--- a/Makefile
+++ b/Makefile
@@@ -194,14 -176,11 +194,15 @@@ ifeq ($(uname_S),SunOS
  	TAR = gtar
  	PLATFORM_DEFINES += -D__EXTENSIONS__
  endif
 -ifneq (,$(findstring arm,$(shell uname -m)))
 -	ARM_SHA1 = YesPlease
 +ifeq ($(uname_O),Cygwin)
 +	NO_STRCASESTR = YesPlease
 +	NEEDS_LIBICONV = YesPlease
 +	NO_IPV6 = YesPlease
 +	X = .exe
 +	PLATFORM_DEFINES += -DUSE_SYMLINK_HEAD=0
  endif
 -ifeq ($(shell uname -s),OpenBSD)
 +ifeq ($(uname_S),OpenBSD)
+ 	NO_STRCASESTR = YesPlease
  	NEEDS_LIBICONV = YesPlease
  	PLATFORM_DEFINES += -I/usr/local/include -L/usr/local/lib
  endif
diff --cc git.sh
index 7400c1625,1c73ca1c2..94940aea2
--- a/git.sh
+++ b/git.sh
@@@ -11,17 -11,7 +11,18 @@@ case "$#" i
  		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 "$@"
++	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
 +	;;
  esac
  
  echo "Usage: git COMMAND [OPTIONS] [TARGET]"