[PATCH] fetch.c: Remove some duplicated code in process()

diff --git a/Makefile b/Makefile
index e8421ccc2de4e8aecd0ea8e56b12f1a8bd2c8c7b..6d73a4d2bc3ef991c1bfb4e973ae6f784768f478 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,9 +9,14 @@
 # Define NO_CURL if you do not have curl installed.  git-http-pull is not
 # built, and you cannot use http:// and https:// transports.
 #
+# Define NO_STRCASESTR if you don't have strcasestr.
+#
 # Define PPC_SHA1 environment variable when running make to make use of
 # a bundled SHA1 routine optimized for PowerPC.
 #
+# Define ARM_SHA1 environment variable when running make to make use of
+# a bundled SHA1 routine optimized for ARM.
+#
 # Define NEEDS_SSL_WITH_CRYPTO if you need -lcrypto with -lssl (Darwin).
 #
 # Define NEEDS_LIBICONV if linking with libc is not enough (Darwin).
@@ -21,6 +26,8 @@
 #
 # Define NO_GETDOMAINNAME if your library lack it (SunOS, Patrick Mauritz).
 #
+# Define WITH_OWN_SUBPROCESS_PY if you want to use with python 2.3.
+#
 # Define COLLISION_CHECK below if you believe that SHA1's
 # 1461501637330902918203684832716283019655932542976 hashes do not give you
 # sufficient guarantee that no collisions between objects will ever happen.
@@ -40,7 +47,7 @@
 
 # DEFINES += -DUSE_STDEV
 
-GIT_VERSION = 0.99.6
+GIT_VERSION = 0.99.7
 
 CFLAGS = -g -O2 -Wall
 ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES)
@@ -109,9 +116,16 @@ PROGRAMS = \
        git-upload-pack git-verify-pack git-write-tree \
        $(SIMPLE_PROGRAMS)
 
+# Backward compatibility -- to be removed in 0.99.8
+PROGRAMS += git-ssh-pull git-ssh-push
+
 PYMODULES = \
        gitMergeCommon.py
 
+ifdef WITH_OWN_SUBPROCESS_PY
+       PYMODULES += compat/subprocess.py
+endif
+
 ifdef WITH_SEND_EMAIL
        SCRIPT_PERL += git-send-email.perl
 endif
@@ -148,7 +162,11 @@ ifeq ($(shell uname -s),Darwin)
 endif
 ifeq ($(shell uname -s),SunOS)
        NEEDS_SOCKET = YesPlease
-       PLATFORM_DEFINES += -DNO_GETDOMAINNAME=1
+       NEEDS_NSL = YesPlease
+       PLATFORM_DEFINES += -D__EXTENSIONS__
+endif
+ifneq (,$(findstring arm,$(shell uname -m)))
+       ARM_SHA1 = YesPlease
 endif
 
 ifndef SHELL_PATH
@@ -179,21 +197,35 @@ ifdef NEEDS_LIBICONV
 else
        LIB_4_ICONV =
 endif
+ifdef NEEDS_SOCKET
+       LIBS += -lsocket
+       SIMPLE_LIB += -lsocket
+endif
+ifdef NEEDS_NSL
+       LIBS += -lnsl
+       SIMPLE_LIB += -lnsl
+endif
+ifdef NO_STRCASESTR
+       DEFINES += -Dstrcasestr=gitstrcasestr
+       LIB_OBJS += compat/strcasestr.o
+endif
+
+ifdef PPC_SHA1
+       SHA1_HEADER = "ppc/sha1.h"
+       LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
+else
+ifdef ARM_SHA1
+       SHA1_HEADER = "arm/sha1.h"
+       LIB_OBJS += arm/sha1.o arm/sha1_arm.o
+else
 ifdef MOZILLA_SHA1
        SHA1_HEADER = "mozilla-sha1/sha1.h"
        LIB_OBJS += mozilla-sha1/sha1.o
 else
-       ifdef PPC_SHA1
-               SHA1_HEADER = "ppc/sha1.h"
-               LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
-       else
-               SHA1_HEADER = <openssl/sha.h>
-               LIBS += $(LIB_4_CRYPTO)
-       endif
+       SHA1_HEADER = <openssl/sha.h>
+       LIBS += $(LIB_4_CRYPTO)
+endif
 endif
-ifdef NEEDS_SOCKET
-       LIBS += -lsocket
-       SIMPLE_LIB += -lsocket
 endif
 
 DEFINES += '-DSHA1_HEADER=$(SHA1_HEADER)'
@@ -250,6 +282,8 @@ git-http-fetch: fetch.o
 git-local-fetch: fetch.o
 git-ssh-fetch: rsh.o fetch.o
 git-ssh-upload: rsh.o
+git-ssh-pull: rsh.o fetch.o
+git-ssh-push: rsh.o
 
 git-http-fetch: LIBS += -lcurl
 git-rev-list: LIBS += $(OPENSSL_LIBSSL)