threads / patch / 22565

patchfilter-branch: Fix error message for --prune-empty --commit-filter

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

## tl;dr

4 messages between Feb 8, 2010 and Feb 12, 2010. Diffs are folded; open one to read it.

replies: 3people: 2as markdown or json

Jacob Helwig· Feb 8, 2010, 02:36 UTC · lore

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'. ---

This problem with filter-branch's error message was originally brought up by hipe in the IRC channel.

 git-filter-branch.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to git-filter-branch.sh +1 −1

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

-- 
1.7.0.rc1.50.g8424

Jacob Helwig· Feb 8, 2010, 02:38 UTC · re: Jacob Helwig · lore

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'.

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(-)

Show changes to git-filter-branch.sh +1 −1

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

-- 
1.7.0.rc1.50.g8424

Michael J Gruber· Feb 8, 2010, 10:10 UTC · re: Jacob Helwig · lore

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

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

Jacob Helwig· Feb 12, 2010, 02:46 UTC · re: Michael J Gruber · lore

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 option name: --commit-filter

Signed-off-by: Jacob Helwig <jacob.helwig@gmail.com>
---

Sorry for taking so long to respond to this.

I wasn't quite happy with the suggested commit message, but hopefully this will make everyone happy.

 git-filter-branch.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to git-filter-branch.sh +1 −1

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

-- 
1.6.6.1