From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Jun 2010 18:16:55 +0000 (-0700)
Subject: Merge branch 'jk/url-decode'
X-Git-Tag: v1.7.2-rc0~56
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bcacc0ebdb17b55040826bf82d1bde4070119250?hp=-c

Merge branch 'jk/url-decode'

* jk/url-decode:
decode file:// and ssh:// URLs
make url-related functions reusable
---

bcacc0ebdb17b55040826bf82d1bde4070119250
diff --combined Makefile
index 5fa893c6fa,4785f3fbec..a07333b7c9
--- a/Makefile
+++ b/Makefile
@@@ -627,6 -627,7 +627,7 @@@ LIB_OBJS += tree-diff.
  LIB_OBJS += tree.o
  LIB_OBJS += tree-walk.o
  LIB_OBJS += unpack-trees.o
+ LIB_OBJS += url.o
  LIB_OBJS += usage.o
  LIB_OBJS += userdiff.o
  LIB_OBJS += utf8.o
@@@ -898,7 -899,6 +899,7 @@@ ifeq ($(uname_S),NetBSD
  	HAVE_PATHS_H = YesPlease
  endif
  ifeq ($(uname_S),AIX)
 +	DEFAULT_PAGER = more
  	NO_STRCASESTR=YesPlease
  	NO_MEMMEM = YesPlease
  	NO_MKDTEMP = YesPlease
@@@ -1040,6 -1040,7 +1041,6 @@@ ifneq (,$(findstring MINGW,$(uname_S))
  	NO_STRTOUMAX = YesPlease
  	NO_MKDTEMP = YesPlease
  	NO_MKSTEMPS = YesPlease
 -	SNPRINTF_RETURNS_BOGUS = YesPlease
  	NO_SVN_TESTS = YesPlease
  	NO_PERL_MAKEMAKER = YesPlease
  	RUNTIME_PREFIX = YesPlease
@@@ -1076,7 -1077,6 +1077,7 @@@ endi
  -include config.mak
  
  ifdef CHECK_HEADER_DEPENDENCIES
 +COMPUTE_HEADER_DEPENDENCIES =
  USE_COMPUTED_HEADER_DEPENDENCIES =
  endif
  
@@@ -1669,10 -1669,7 +1670,10 @@@ git.o git.spec 
  
  TEST_OBJS := $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS))
  GIT_OBJS := $(LIB_OBJS) $(BUILTIN_OBJS) $(PROGRAM_OBJS) $(TEST_OBJS) \
 -	git.o http.o http-walker.o remote-curl.o
 +	git.o
 +ifndef NO_CURL
 +	GIT_OBJS += http.o http-walker.o remote-curl.o
 +endif
  XDIFF_OBJS = xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o \
  	xdiff/xmerge.o xdiff/xpatience.o
  OBJECTS := $(GIT_OBJS) $(XDIFF_OBJS)
@@@ -2012,13 -2009,12 +2013,13 @@@ endi
  		ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
  		cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
  	  done; } && \
 -	{ for p in $(REMOTE_CURL_ALIASES); do \
 +	{ test x"$(REMOTE_CURL_ALIASES)" = x || \
 +		{ for p in $(REMOTE_CURL_ALIASES); do \
  		$(RM) "$$execdir/$$p" && \
  		ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
  		ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
  		cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \
 -	  done; } && \
 +	  done; } ; } && \
  	./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
  
  install-gitweb: