From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Dec 2007 07:01:15 +0000 (-0800)
Subject: Merge branch 'js/fast-export'
X-Git-Tag: v1.5.4-rc0~103
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/de4c6011d2d745a3e29b4b0cc94548f34c8855dd?hp=-c

Merge branch 'js/fast-export'

* js/fast-export:
Add 'git fast-export', the sister of 'git fast-import'
---

de4c6011d2d745a3e29b4b0cc94548f34c8855dd
diff --combined Makefile
index d5d2c7c0c0,2bdc6ca3e2..feb52c6860
--- a/Makefile
+++ b/Makefile
@@@ -111,7 -111,7 +111,7 @@@ all:
  # times (my ext3 doesn't).
  #
  # Define USE_STDEV below if you want git to care about the underlying device
 -# change being considered an inode change from the update-cache perspective.
 +# change being considered an inode change from the update-index perspective.
  #
  # Define ASCIIDOC8 if you want to format documentation with AsciiDoc 8
  #
@@@ -259,7 -259,7 +259,7 @@@ EXTRA_PROGRAMS 
  BUILT_INS = \
  	git-format-patch$X git-show$X git-whatchanged$X git-cherry$X \
  	git-get-tar-commit-id$X git-init$X git-repo-config$X \
 -	git-fsck-objects$X git-cherry-pick$X \
 +	git-fsck-objects$X git-cherry-pick$X git-peek-remote$X \
  	$(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS))
  
  # what 'all' will build and 'install' will install, in gitexecdir
@@@ -269,6 -269,9 +269,6 @@@ ALL_PROGRAMS += git-merge-subtree$
  
  # what 'all' will build but not install in gitexecdir
  OTHER_PROGRAMS = git$X gitweb/gitweb.cgi
 -ifndef NO_TCLTK
 -OTHER_PROGRAMS += gitk-wish
 -endif
  
  # Set paths to tools early so that they can be used for version tests.
  ifndef SHELL_PATH
@@@ -334,6 -337,7 +334,7 @@@ BUILTIN_OBJS = 
  	builtin-diff-files.o \
  	builtin-diff-index.o \
  	builtin-diff-tree.o \
+ 	builtin-fast-export.o \
  	builtin-fetch.o \
  	builtin-fetch-pack.o \
  	builtin-fetch--tool.o \
@@@ -772,7 -776,6 +773,7 @@@ endi
  all::
  ifndef NO_TCLTK
  	$(QUIET_SUBDIR0)git-gui $(QUIET_SUBDIR1) all
 +	$(QUIET_SUBDIR0)gitk-git $(QUIET_SUBDIR1) all
  endif
  	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all
  	$(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1)
@@@ -780,6 -783,12 +781,6 @@@
  strip: $(PROGRAMS) git$X
  	$(STRIP) $(STRIP_OPTS) $(PROGRAMS) git$X
  
 -gitk-wish: gitk GIT-GUI-VARS
 -	$(QUIET_GEN)$(RM) $@ $@+ && \
 -	sed -e '1,3s|^exec .* "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' <gitk >$@+ && \
 -	chmod +x $@+ && \
 -	mv -f $@+ $@
 -
  git.o: git.c common-cmds.h GIT-CFLAGS
  	$(QUIET_CC)$(CC) -DGIT_VERSION='"$(GIT_VERSION)"' \
  		$(ALL_CFLAGS) -c $(filter %.c,$^)
@@@ -796,7 -805,7 +797,7 @@@ git-merge-subtree$X: git-merge-recursiv
  $(BUILT_INS): git$X
  	$(QUIET_BUILT_IN)$(RM) $@ && ln git$X $@
  
 -common-cmds.h: ./generate-cmdlist.sh
 +common-cmds.h: ./generate-cmdlist.sh command-list.txt
  
  common-cmds.h: $(wildcard Documentation/git-*.txt)
  	$(QUIET_GEN)./generate-cmdlist.sh > $@+ && mv $@+ $@
@@@ -1023,7 -1032,7 +1024,7 @@@ install: al
  	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
  	$(MAKE) -C perl prefix='$(prefix_SQ)' install
  ifndef NO_TCLTK
 -	$(INSTALL) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
 +	$(MAKE) -C gitk-git install
  	$(MAKE) -C git-gui install
  endif
  	if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \
@@@ -1116,7 -1125,7 +1117,7 @@@ clean
  	$(MAKE) -C templates/ clean
  	$(MAKE) -C t/ clean
  ifndef NO_TCLTK
 -	$(RM) gitk-wish
 +	$(MAKE) -C gitk-git clean
  	$(MAKE) -C git-gui clean
  endif
  	$(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-GUI-VARS
@@@ -1138,7 -1147,7 +1139,7 @@@ check-docs:
  		esac ; \
  		test -f "Documentation/$$v.txt" || \
  		echo "no doc: $$v"; \
 -		sed -e '1,/^__DATA__/d' Documentation/cmd-list.perl | \
 +		sed -e '/^#/d' command-list.txt | \
  		grep -q "^$$v[ 	]" || \
  		case "$$v" in \
  		git) ;; \
@@@ -1146,9 -1155,9 +1147,9 @@@
  		esac ; \
  	done; \
  	( \
 -		sed -e '1,/^__DATA__/d' \
 +		sed -e '/^#/d' \
  		    -e 's/[ 	].*//' \
 -		    -e 's/^/listed /' Documentation/cmd-list.perl; \
 +		    -e 's/^/listed /' command-list.txt; \
  		ls -1 Documentation/git*txt | \
  		sed -e 's|Documentation/|documented |' \
  		    -e 's/\.txt//'; \