From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 23 Jun 2007 06:20:40 +0000 (-0700)
Subject: Merge branch 'js/filter'
X-Git-Tag: v1.5.3-rc0~69
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0f2890acd999e63892d0b5b401e70bdaefe3ba51?ds=inline;hp=-c

Merge branch 'js/filter'

* js/filter:
filter-branch: subdirectory filter needs --full-history
filter-branch: Simplify parent computation.
Teach filter-branch about subdirectory filtering
filter-branch: also don't fail in map() if a commit cannot be mapped
filter-branch: Use rev-list arguments to specify revision ranges.
filter-branch: fix behaviour of '-k'
filter-branch: use $(($i+1)) instead of $((i+1))
chmod +x git-filter-branch.sh
filter-branch: prevent filters from reading from stdin
t7003: make test repeatable
Add git-filter-branch
---

0f2890acd999e63892d0b5b401e70bdaefe3ba51
diff --combined Makefile
index c09dfaf3f0,69f3b66714..0d904a93b9
--- a/Makefile
+++ b/Makefile
@@@ -107,8 -107,6 +107,8 @@@ all:
  # 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.
  #
 +# Define ASCIIDOC8 if you want to format documentation with AsciiDoc 8
 +#
  # Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
  # MakeMaker (e.g. using ActiveState under Cygwin).
  #
@@@ -146,8 -144,8 +146,8 @@@ STRIP ?= stri
  prefix = $(HOME)
  bindir = $(prefix)/bin
  gitexecdir = $(bindir)
 -sharedir = $(prefix)/share/
 -template_dir = $(sharedir)/git-core/templates/
 +sharedir = $(prefix)/share
 +template_dir = $(sharedir)/git-core/templates
  ifeq ($(prefix),/usr)
  sysconfdir = /etc
  else
@@@ -211,7 -209,8 +211,8 @@@ SCRIPT_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-quiltimport.sh git-submodule.sh
+ 	git-lost-found.sh git-quiltimport.sh git-submodule.sh \
+ 	git-filter-branch.sh
  
  SCRIPT_PERL = \
  	git-add--interactive.perl \
@@@ -240,6 -239,7 +241,6 @@@ PROGRAMS = 
  	git-convert-objects$X git-fetch-pack$X \
  	git-hash-object$X git-index-pack$X git-local-fetch$X \
  	git-fast-import$X \
 -	git-merge-base$X \
  	git-daemon$X \
  	git-merge-index$X git-mktag$X git-mktree$X git-patch-id$X \
  	git-peek-remote$X git-receive-pack$X \
@@@ -412,7 -412,6 +413,7 @@@ ifeq ($(uname_S),SunOS
  	NEEDS_NSL = YesPlease
  	SHELL_PATH = /bin/bash
  	NO_STRCASESTR = YesPlease
 +	NO_HSTRERROR = YesPlease
  	ifeq ($(uname_R),5.8)
  		NEEDS_LIBICONV = YesPlease
  		NO_UNSETENV = YesPlease
@@@ -657,10 -656,6 +658,10 @@@ endi
  ifdef NO_PERL_MAKEMAKER
  	export NO_PERL_MAKEMAKER
  endif
 +ifdef NO_HSTRERROR
 +	COMPAT_CFLAGS += -DNO_HSTRERROR
 +	COMPAT_OBJS += compat/hstrerror.o
 +endif
  
  ifeq ($(TCLTK_PATH),)
  NO_TCLTK=NoThanks
@@@ -691,10 -686,6 +692,10 @@@ ifndef 
  endif
  endif
  
 +ifdef ASCIIDOC8
 +	export ASCIIDOC8
 +endif
 +
  # Shell quote (do not use $(call) to accommodate ancient setups);
  
  SHA1_HEADER_SQ = $(subst ','\'',$(SHA1_HEADER))
@@@ -746,13 -737,9 +747,13 @@@ gitk-wish: gitk GIT-GUI-VAR
  	chmod +x $@+ && \
  	mv -f $@+ $@
  
 -git$X: git.c common-cmds.h $(BUILTIN_OBJS) $(GITLIBS) GIT-CFLAGS
 +git.o: git.c common-cmds.h GIT-CFLAGS
 +	$(QUIET_CC)$(CC) -DGIT_VERSION='"$(GIT_VERSION)"' \
 +		$(ALL_CFLAGS) -c $(filter %.c,$^)
 +
 +git$X: git.o $(BUILTIN_OBJS) $(GITLIBS)
  	$(QUIET_LINK)$(CC) -DGIT_VERSION='"$(GIT_VERSION)"' \
 -		$(ALL_CFLAGS) -o $@ $(filter %.c,$^) \
 +		$(ALL_CFLAGS) -o $@ $(filter %.c,$^) git.o \
  		$(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)
  
  help.o: common-cmds.h
@@@ -763,8 -750,6 +764,8 @@@ git-merge-subtree$X: git-merge-recursiv
  $(BUILT_INS): git$X
  	$(QUIET_BUILT_IN)rm -f $@ && ln git$X $@
  
 +common-cmds.h: ./generate-cmdlist.sh
 +
  common-cmds.h: $(wildcard Documentation/git-*.txt)
  	$(QUIET_GEN)./generate-cmdlist.sh > $@+ && mv $@+ $@
  
@@@ -862,8 -847,6 +863,8 @@@ git$X git.spec 
  
  %.o: %.c GIT-CFLAGS
  	$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) $<
 +%.s: %.c GIT-CFLAGS
 +	$(QUIET_CC)$(CC) -S $(ALL_CFLAGS) $<
  %.o: %.S
  	$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) $<
  
@@@ -1069,9 -1052,8 +1070,9 @@@ dist-doc
  
  clean:
  	rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \
 -		test-chmtime$X test-genrandom$X $(LIB_FILE) $(XDIFF_LIB)
 +		$(LIB_FILE) $(XDIFF_LIB)
  	rm -f $(ALL_PROGRAMS) $(BUILT_INS) git$X
 +	rm -f $(TEST_PROGRAMS)
  	rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
  	rm -rf autom4te.cache
  	rm -f configure config.log config.mak.autogen config.mak.append config.status config.cache