From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 12 Dec 2013 22:18:33 +0000 (-0800)
Subject: Merge branch 'jk/remove-deprecated'
X-Git-Tag: v1.9-rc0~73
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/577aed296a8d6dbc0747982c0a7d14bf543c67fa?hp=-c

Merge branch 'jk/remove-deprecated'

* jk/remove-deprecated:
stop installing git-tar-tree link
peek-remote: remove deprecated alias of ls-remote
lost-found: remove deprecated command
tar-tree: remove deprecated command
repo-config: remove deprecated alias for "git config"
---

577aed296a8d6dbc0747982c0a7d14bf543c67fa
diff --combined .gitignore
index a78367c17f,c2ad802ffb..b5f9defed3
--- a/.gitignore
+++ b/.gitignore
@@@ -2,7 -2,6 +2,7 @@@
  /GIT-CFLAGS
  /GIT-LDFLAGS
  /GIT-PREFIX
 +/GIT-PERL-DEFINES
  /GIT-PYTHON-VARS
  /GIT-SCRIPT-DEFINES
  /GIT-USER-AGENT
@@@ -76,7 -75,6 +76,6 @@@
  /git-init-db
  /git-instaweb
  /git-log
- /git-lost-found
  /git-ls-files
  /git-ls-remote
  /git-ls-tree
@@@ -106,7 -104,6 +105,6 @@@
  /git-pack-refs
  /git-parse-remote
  /git-patch-id
- /git-peek-remote
  /git-prune
  /git-prune-packed
  /git-pull
@@@ -132,7 -129,6 +130,6 @@@
  /git-remote-testsvn
  /git-repack
  /git-replace
- /git-repo-config
  /git-request-pull
  /git-rerere
  /git-reset
@@@ -160,7 -156,6 +157,6 @@@
  /git-svn
  /git-symbolic-ref
  /git-tag
- /git-tar-tree
  /git-unpack-file
  /git-unpack-objects
  /git-update-index
diff --combined Makefile
index 67f1754903,37beb7320c..b4af1e2058
--- a/Makefile
+++ b/Makefile
@@@ -452,7 -452,6 +452,6 @@@ SCRIPT_SH += git-am.s
  SCRIPT_SH += git-bisect.sh
  SCRIPT_SH += git-difftool--helper.sh
  SCRIPT_SH += git-filter-branch.sh
- SCRIPT_SH += git-lost-found.sh
  SCRIPT_SH += git-merge-octopus.sh
  SCRIPT_SH += git-merge-one-file.sh
  SCRIPT_SH += git-merge-resolve.sh
@@@ -587,11 -586,8 +586,8 @@@ BUILT_INS += git-cherry$
  BUILT_INS += git-cherry-pick$X
  BUILT_INS += git-format-patch$X
  BUILT_INS += git-fsck-objects$X
- BUILT_INS += git-get-tar-commit-id$X
  BUILT_INS += git-init$X
  BUILT_INS += git-merge-subtree$X
- BUILT_INS += git-peek-remote$X
- BUILT_INS += git-repo-config$X
  BUILT_INS += git-show$X
  BUILT_INS += git-stage$X
  BUILT_INS += git-status$X
@@@ -932,6 -928,7 +928,7 @@@ BUILTIN_OBJS += builtin/fmt-merge-msg.
  BUILTIN_OBJS += builtin/for-each-ref.o
  BUILTIN_OBJS += builtin/fsck.o
  BUILTIN_OBJS += builtin/gc.o
+ BUILTIN_OBJS += builtin/get-tar-commit-id.o
  BUILTIN_OBJS += builtin/grep.o
  BUILTIN_OBJS += builtin/hash-object.o
  BUILTIN_OBJS += builtin/help.o
@@@ -983,7 -980,6 +980,6 @@@ BUILTIN_OBJS += builtin/show-ref.
  BUILTIN_OBJS += builtin/stripspace.o
  BUILTIN_OBJS += builtin/symbolic-ref.o
  BUILTIN_OBJS += builtin/tag.o
- BUILTIN_OBJS += builtin/tar-tree.o
  BUILTIN_OBJS += builtin/unpack-file.o
  BUILTIN_OBJS += builtin/unpack-objects.o
  BUILTIN_OBJS += builtin/update-index.o
@@@ -1588,7 -1584,6 +1584,7 @@@ PERL_PATH_SQ = $(subst ','\'',$(PERL_PA
  PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
  TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
  DIFF_SQ = $(subst ','\'',$(DIFF))
 +PERLLIB_EXTRA_SQ = $(subst ','\'',$(PERLLIB_EXTRA))
  
  LIBS = $(GITLIBS) $(EXTLIBS)
  
@@@ -1793,12 -1788,9 +1789,12 @@@ perl/PM.stamp: FORC
  perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL
  	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
  
 -$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl GIT-VERSION-FILE
 +PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ)
 +$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE
  	$(QUIET_GEN)$(RM) $@ $@+ && \
  	INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
 +	INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \
 +	INSTLIBDIR="$$INSTLIBDIR$${INSTLIBDIR_EXTRA:+:$$INSTLIBDIR_EXTRA}" && \
  	sed -e '1{' \
  	    -e '	s|#!.*perl|#!$(PERL_PATH_SQ)|' \
  	    -e '	h' \
@@@ -1811,13 -1803,6 +1807,13 @@@
  	chmod +x $@+ && \
  	mv $@+ $@
  
 +GIT-PERL-DEFINES: FORCE
 +	@FLAGS='$(PERL_DEFINES)'; \
 +	    if test x"$$FLAGS" != x"`cat $@ 2>/dev/null`" ; then \
 +		echo >&2 "    * new perl-specific parameters"; \
 +		echo "$$FLAGS" >$@; \
 +	    fi
 +
  
  .PHONY: gitweb
  gitweb:
@@@ -2505,8 -2490,7 +2501,8 @@@ ifndef NO_TCLT
  	$(MAKE) -C git-gui clean
  endif
  	$(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-LDFLAGS GIT-BUILD-OPTIONS
 -	$(RM) GIT-USER-AGENT GIT-PREFIX GIT-SCRIPT-DEFINES GIT-PYTHON-VARS
 +	$(RM) GIT-USER-AGENT GIT-PREFIX
 +	$(RM) GIT-SCRIPT-DEFINES GIT-PERL-DEFINES GIT-PYTHON-VARS
  
  .PHONY: all install profile-clean clean strip
  .PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell