From: Junio C Hamano <junkio@cox.net>
Date: Wed, 1 Mar 2006 09:33:23 +0000 (-0800)
Subject: Merge branch 'cvsserver' of http://locke.catalyst.net.nz/git/git-martinlanghoff; branch 'master' into next
X-Git-Tag: v1.3.0-rc1~54^2~21
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6ecc321ba5d8f89a8dd0a9a11d264d03ab624dc1?hp=-c

Merge branch 'cvsserver' of locke.catalyst.net.nz/git/git-martinlanghoff; branch 'master' into next

Conflicts:

Documentation/git-cvsserver.txt
git-cvsserver.perl

Originally Martin's tree was based on "next", which meant that all
the other things that I am not ready to push out to "master" were
contained in it.  His changes looked good, and I wanted to have them
in "master".

So, here is what I did:

- fetch Martin's tree into a temporary topic branch.
$ git fetch $URL $remote:ml/cvsserver
$ git checkout ml/cvsserver

- rebase it on top of "master".
$ git rebase --onto master next

- pull that master into "next", recording Martin's head as well.
$ git pull --append . master

Since I have apply.whitespace=strip in my configuration file, the
rebased cvsserver changes have trailing whitespaces introduced by
Martin's tree cleansed out.  Hence the above conflicts.

The reason I made this octopus is to make sure that next time Martin
pulls from my "next" branch, it results in a fast forward.  There is
no reason to force him do the same conflict resolution I did with this
merge.

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

6ecc321ba5d8f89a8dd0a9a11d264d03ab624dc1
diff --combined Makefile
index 5e93f278fc,5e93f278fc,19578fc93a..26ef1f8104
--- a/Makefile
+++ b/Makefile
@@@@ -165,7 -165,7 -165,7 +165,7 @@@@ PROGRAMS = 
   	git-upload-pack$X git-verify-pack$X git-write-tree$X \
   	git-update-ref$X git-symbolic-ref$X git-check-ref-format$X \
   	git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
  -	git-describe$X git-merge-tree$X
  +	git-describe$X git-merge-tree$X git-blame$X
   
   # what 'all' will build and 'install' will install, in gitexecdir
   ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@@@ -192,7 -192,7 -192,7 +192,7 @@@@ LIB_FILE=libgit.
   LIB_H = \
   	blob.h cache.h commit.h count-delta.h csum-file.h delta.h \
   	diff.h epoch.h object.h pack.h pkt-line.h quote.h refs.h \
  -	run-command.h strbuf.h tag.h tree.h git-compat-util.h
  +	run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h
   
   DIFF_OBJS = \
   	diff.o diffcore-break.o diffcore-order.o diffcore-pathspec.o \
@@@@ -205,7 -205,7 -205,7 +205,7 @@@@ LIB_OBJS = 
   	quote.o read-cache.o refs.o run-command.o \
   	server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \
   	tag.o tree.o usage.o config.o environment.o ctype.o copy.o \
  -	fetch-clone.o \
  +	fetch-clone.o revision.o \
   	$(DIFF_OBJS)
   
   LIBS = $(LIB_FILE)
@@@@ -223,11 -223,11 -223,15 +223,15 @@@@ ifeq ($(uname_S),Darwin
   	NEEDS_SSL_WITH_CRYPTO = YesPlease
   	NEEDS_LIBICONV = YesPlease
   	## fink
-- 	ALL_CFLAGS += -I/sw/include
-- 	ALL_LDFLAGS += -L/sw/lib
++ 	ifeq ($(shell test -d /sw/lib && echo y),y)
++ 		ALL_CFLAGS += -I/sw/include
++ 		ALL_LDFLAGS += -L/sw/lib
++ 	endif
   	## darwinports
-- 	ALL_CFLAGS += -I/opt/local/include
-- 	ALL_LDFLAGS += -L/opt/local/lib
++ 	ifeq ($(shell test -d /opt/local/lib && echo y),y)
++ 		ALL_CFLAGS += -I/opt/local/include
++ 		ALL_LDFLAGS += -L/opt/local/lib
++ 	endif
   endif
   ifeq ($(uname_S),SunOS)
   	NEEDS_SOCKET = YesPlease