Re: Cannot rewrite branch(es) with a dirty working directory

From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Sep 2, 2011, 05:52 UTC
Message-ID: <vpqpqjjlcdr.fsf@bauges.imag.fr>
In-Reply-To: <20110901215306.GD16308@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 13 quoted lines

> --- a/git-filter-branch.sh
> +++ b/git-filter-branch.sh
> @@ -108,9 +108,7 @@ 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

Sounds good, yes.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/