Merge branch 'fixes'

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

diff --cc Makefile
index f7eee4708a5df439c5a39d4b3fae6ebc9baa4d4c,e67d0e78228d186a4358ede07bb686bbac53678b..0ca8e8d270d4a07c41728d9b09de9538fe5cc714
--- 1/Makefile
--- 2/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 7400c162578c5e18a2a406b09263394e485e0990,1c73ca1c20be9861cce22ea4ca99f60d9e3d9173..94940aea28a45294126b9065e09017ae302e7a51
--- 1/git.sh
--- 2/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]"