From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 12 Feb 2010 07:06:32 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.0~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/618d18b5aa9420fe446f7a1ed69d65fb45fa49b7?ds=inline;hp=-c

Merge branch 'maint'

* maint:
filter-branch: Fix error message for --prune-empty --commit-filter
---

618d18b5aa9420fe446f7a1ed69d65fb45fa49b7
diff --combined git-filter-branch.sh
index e95845c0d6,3dfb2c3382..88fb0f070e
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@@ -207,7 -207,7 +207,7 @@@ t,
  ,*)
  	;;
  *)
- 	die "Cannot set --prune-empty and --filter-commit at the same time"
+ 	die "Cannot set --prune-empty and --commit-filter at the same time"
  esac
  
  case "$force" in
@@@ -259,6 -259,7 +259,6 @@@ test -s "$tempdir"/heads |
  
  GIT_INDEX_FILE="$(pwd)/../index"
  export GIT_INDEX_FILE
 -git read-tree || die "Could not seed the index"
  
  # map old->new commit ids for rewriting parents
  mkdir ../map || die "Could not create map/ directory"
@@@ -331,7 -332,7 +331,7 @@@ while read commit parents; d
  			die "tree filter failed: $filter_tree"
  
  		(
 -			git diff-index -r --name-only $commit &&
 +			git diff-index -r --name-only --ignore-submodules $commit &&
  			git ls-files --others
  		) > "$tempdir"/tree-state || exit
  		git update-index --add --replace --remove --stdin \
@@@ -462,11 -463,11 +462,11 @@@ if [ "$filter_tag_name" ]; the
  						"$new_sha1" "$new_ref"
  				git cat-file tag "$ref" |
  				sed -n \
 -				    -e "1,/^$/{
 +				    -e '1,/^$/{
  					  /^object /d
  					  /^type /d
  					  /^tag /d
 -					}" \
 +					}' \
  				    -e '/^-----BEGIN PGP SIGNATURE-----/q' \
  				    -e 'p' ) |
  				git mktag) ||