From: Patrick Mauritz <oxygene@studentenbude.ath.cx>
Date: Mon, 19 Sep 2005 14:11:19 GMT
Subject: Re: [PATCHES] CURLDIR support, more usable cmd-rename.sh
Message-ID: <1127139079.781.9.camel@divert>
In-Reply-To: <20050919133731.GB2903@pasky.or.cz>

On Mon, 2005-09-19 at 15:37, Petr Baudis wrote:
> seems that they didn't quite get attached in the end. ;-)
oops :)
here they are

> Linus already did in <Pine.LNX.4.58.0509181829310.9106@g5.osdl.org>.
yay :)


patrick mauritz


diff -ur git-core-0.99.7.orig//Makefile git-core-0.99.7/Makefile
--- git-core-0.99.7.orig//Makefile	Mon Sep 19 12:43:04 2005
+++ git-core-0.99.7/Makefile	Mon Sep 19 12:45:45 2005
@@ -42,7 +42,10 @@
 
 GIT_VERSION = 0.99.7
 
-CFLAGS = -g -O2 -Wall
+CFLAGS = -g -O2
+ifdef CURLDIR
+CFLAGS+=-I$(CURLDIR)/include
+endif
 ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES)
 
 prefix = $(HOME)
@@ -261,7 +264,11 @@
 git-ssh-pull: rsh.o fetch.o
 git-ssh-push: rsh.o
 
+ifdef CURLDIR
+git-http-fetch: LIBS += -L$(CURLDIR)/lib -R$(CURLDIR)/lib -lcurl
+else
 git-http-fetch: LIBS += -lcurl
+endif
 git-rev-list: LIBS += $(OPENSSL_LIBSSL)
 
 init-db.o: init-db.c


--- cmd-rename.sh~	Mon Sep 19 12:53:40 2005
+++ git-core-0.99.7/cmd-rename.sh	Mon Sep 19 12:53:58 2005
@@ -4,7 +4,9 @@
 while read old new
 do
 	rm -f "$d/$old"
+	if [ -x "$d/$new" ]; then
 	ln -s "$new" "$d/$old"
+	fi
 done <<\EOF
 git-add-script	git-add
 git-archimport-script	git-archimport