From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Jun 2007 23:08:34 +0000 (-0700)
Subject: Merge branch 'js/filter' into ei/worktree+filter
X-Git-Tag: v1.5.3-rc0~30^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3270736bd1e63c63679f64f8325690889322df08?ds=inline;hp=-c

Merge branch 'js/filter' into ei/worktree+filter

* js/filter:
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
---

3270736bd1e63c63679f64f8325690889322df08
diff --combined Makefile
index 0f7595552d,69f3b66714..2d8c3089a6
--- a/Makefile
+++ b/Makefile
@@@ -209,7 -209,8 +209,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 \
@@@ -238,6 -239,7 +239,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 \
@@@ -1050,9 -1052,8 +1051,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