From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 16 Oct 2011 03:46:38 +0000 (-0700)
Subject: Merge branch 'jk/filter-branch-require-clean-work-tree' into maint
X-Git-Tag: v1.7.7.1~16
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3197bd850b193a0d182674ab9705cf4acdc313e3?ds=inline;hp=-c

Merge branch 'jk/filter-branch-require-clean-work-tree' into maint

* jk/filter-branch-require-clean-work-tree:
filter-branch: use require_clean_work_tree
---

3197bd850b193a0d182674ab9705cf4acdc313e3
diff --combined git-filter-branch.sh
index 804a7f4bc9,f5c4db6413..add2c0247f
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@@ -12,7 -12,7 +12,7 @@@
  
  functions=$(cat << \EOF
  warn () {
 -        echo "$*" >&2
 +	echo "$*" >&2
  }
  
  map()
@@@ -98,19 -98,17 +98,17 @@@ set_ident () 
  }
  
  USAGE="[--env-filter <command>] [--tree-filter <command>]
 -            [--index-filter <command>] [--parent-filter <command>]
 -            [--msg-filter <command>] [--commit-filter <command>]
 -            [--tag-name-filter <command>] [--subdirectory-filter <directory>]
 -            [--original <namespace>] [-d <directory>] [-f | --force]
 -            [<rev-list options>...]"
 +	[--index-filter <command>] [--parent-filter <command>]
 +	[--msg-filter <command>] [--commit-filter <command>]
 +	[--tag-name-filter <command>] [--subdirectory-filter <directory>]
 +	[--original <namespace>] [-d <directory>] [-f | --force]
 +	[<rev-list options>...]"
  
  OPTIONS_SPEC=
  . git-sh-setup
  
  if [ "$(is_bare_repository)" = false ]; then
- 	git diff-files --ignore-submodules --quiet &&
- 	git diff-index --cached --quiet HEAD -- ||
- 	die "Cannot rewrite branch(es) with a dirty working directory."
+ 	require_clean_work_tree 'rewrite branches'
  fi
  
  tempdir=.git-rewrite