From: Junio C Hamano <junkio@cox.net>
Date: Fri, 19 May 2006 23:57:11 +0000 (-0700)
Subject: Merge branch 'eb/quilt'
X-Git-Tag: v1.4.0-rc1~116
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/667661d46ef3de6ec38d915f048b4008c0b7c27d?hp=-c

Merge branch 'eb/quilt'

* eb/quilt:
Implement a --dry-run option to git-quiltimport
Implement git-quiltimport
---

667661d46ef3de6ec38d915f048b4008c0b7c27d
diff --combined Makefile
index e804010296,549f953b76..3a31ce0150
--- a/Makefile
+++ b/Makefile
@@@ -125,7 -125,7 +125,7 @@@ SCRIPT_SH = 
  	git-applymbox.sh git-applypatch.sh git-am.sh \
  	git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
  	git-merge-resolve.sh git-merge-ours.sh \
- 	git-lost-found.sh
+ 	git-lost-found.sh git-quiltimport.sh
  
  SCRIPT_PERL = \
  	git-archimport.perl git-cvsimport.perl git-relink.perl \
@@@ -154,7 -154,7 +154,7 @@@ PROGRAMS = 
  	git-convert-objects$X git-diff-files$X \
  	git-diff-index$X git-diff-stages$X \
  	git-diff-tree$X git-fetch-pack$X git-fsck-objects$X \
 -	git-hash-object$X git-index-pack$X git-init-db$X git-local-fetch$X \
 +	git-hash-object$X git-index-pack$X git-local-fetch$X \
  	git-ls-files$X git-ls-tree$X git-mailinfo$X git-merge-base$X \
  	git-merge-index$X git-mktag$X git-mktree$X git-pack-objects$X git-patch-id$X \
  	git-peek-remote$X git-prune-packed$X git-read-tree$X \
@@@ -170,8 -170,7 +170,8 @@@
  
  BUILT_INS = git-log$X git-whatchanged$X git-show$X \
  	git-count-objects$X git-diff$X git-push$X \
 -	git-grep$X git-rev-list$X git-check-ref-format$X
 +	git-grep$X git-rev-list$X git-check-ref-format$X \
 +	git-init-db$X
  
  # what 'all' will build and 'install' will install, in gitexecdir
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@@ -219,8 -218,7 +219,8 @@@ LIB_OBJS = 
  
  BUILTIN_OBJS = \
  	builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \
 -	builtin-grep.o builtin-rev-list.o builtin-check-ref-format.o
 +	builtin-grep.o builtin-rev-list.o builtin-check-ref-format.o \
 +	builtin-init-db.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  LIBS = $(GITLIBS) -lz
@@@ -475,7 -473,6 +475,7 @@@ strip: $(PROGRAMS) git$
  
  git$X: git.c common-cmds.h $(BUILTIN_OBJS) $(GITLIBS)
  	$(CC) -DGIT_VERSION='"$(GIT_VERSION)"' \
 +		-DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"' \
  		$(ALL_CFLAGS) -o $@ $(filter %.c,$^) \
  		$(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)
  
@@@ -568,6 -565,10 +568,6 @@@ git-http-push$X: revision.o http.o http
  	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
  		$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
  
 -init-db.o: init-db.c
 -	$(CC) -c $(ALL_CFLAGS) \
 -		-DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"' $*.c
 -
  $(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H)
  $(patsubst git-%$X,%.o,$(PROGRAMS)): $(GITLIBS)
  $(DIFF_OBJS): diffcore.h
@@@ -651,25 -652,6 +651,25 @@@ dist: git.spec git-tar-tre
  rpm: dist
  	$(RPMBUILD) -ta $(GIT_TARNAME).tar.gz
  
 +htmldocs = git-htmldocs-$(GIT_VERSION)
 +manpages = git-manpages-$(GIT_VERSION)
 +dist-doc:
 +	rm -fr .doc-tmp-dir
 +	mkdir .doc-tmp-dir
 +	$(MAKE) -C Documentation WEBDOC_DEST=../.doc-tmp-dir install-webdoc
 +	cd .doc-tmp-dir && $(TAR) cf ../$(htmldocs).tar .
 +	gzip -n -9 -f $(htmldocs).tar
 +	:
 +	rm -fr .doc-tmp-dir
 +	mkdir .doc-tmp-dir .doc-tmp-dir/man1 .doc-tmp-dir/man7
 +	$(MAKE) -C Documentation DESTDIR=. \
 +		man1=../.doc-tmp-dir/man1 \
 +		man7=../.doc-tmp-dir/man7 \
 +		install
 +	cd .doc-tmp-dir && $(TAR) cf ../$(manpages).tar .
 +	gzip -n -9 -f $(manpages).tar
 +	rm -fr .doc-tmp-dir
 +
  ### Cleaning rules
  
  clean:
@@@ -677,9 -659,8 +677,9 @@@
  		$(LIB_FILE) $(XDIFF_LIB)
  	rm -f $(ALL_PROGRAMS) $(BUILT_INS) git$X
  	rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
 -	rm -rf $(GIT_TARNAME)
 +	rm -rf $(GIT_TARNAME) .doc-tmp-dir
  	rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
 +	rm -f $(htmldocs).tar $(manpages).tar
  	$(MAKE) -C Documentation/ clean
  	$(MAKE) -C templates clean
  	$(MAKE) -C t/ clean