Re: [PATCH] filter-branch: Fix error message for --prune-empty --commit-filter

From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Feb 8, 2010, 10:10 UTC
Message-ID: <4B6FE325.5000909@drmicha.warpmail.net>
In-Reply-To: <1265596681-10561-1-git-send-email-jacob.helwig@gmail.com>

Jacob Helwig venit, vidit, dixit 08.02.2010 03:38:

> Running filter-branch with --prune-empty and --commit-filter, no longer
> incorrectly reports that you had tried to run '--filter-commit' in
> combination with '--prune-empty'.

In order to understand this sentence, I had to look twice at the patch text.

What's going on is that that typo was there from the beginning, right? (Induced from the name of a script variable, I see.) How about:

Running filter-branch with --prune-empty and --commit-filter reports "Cannot set --prune-empty and --filter-commit at the same time".

Change it to use the correct name "--commit-filter" of the option.

Show 21 quoted lines

> Signed-off-by: Jacob Helwig <jacob.helwig@gmail.com>
> ---
> 
> Sorry for the re-send.  Forgot the SOB...
> 
>  git-filter-branch.sh |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/git-filter-branch.sh b/git-filter-branch.sh
> index e95845c..88fb0f0 100755
> --- a/git-filter-branch.sh
> +++ b/git-filter-branch.sh
> @@ -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