Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
  • Loading branch information...
commit 3197bd850b193a0d182674ab9705cf4acdc313e3 2 parents d7b7dd3 + 5347a50
Junio C Hamano authored October 15, 2011

Showing 1 changed file with 1 addition and 3 deletions. Show diff stats Hide diff stats

  1. 4  git-filter-branch.sh
4  git-filter-branch.sh
@@ -108,9 +108,7 @@ OPTIONS_SPEC=
108 108
 . git-sh-setup
109 109
 
110 110
 if [ "$(is_bare_repository)" = false ]; then
111  
-	git diff-files --ignore-submodules --quiet &&
112  
-	git diff-index --cached --quiet HEAD -- ||
113  
-	die "Cannot rewrite branch(es) with a dirty working directory."
  111
+	require_clean_work_tree 'rewrite branches'
114 112
 fi
115 113
 
116 114
 tempdir=.git-rewrite

0 notes on commit 3197bd8

Please sign in to comment.
Something went wrong with that request. Please try again.