{"thread":{"id":"22565","subject":"[PATCH] filter-branch: Fix error message for --prune-empty --commit-filter","startedAt":"2010-02-08T02:36:27Z","lastAt":"2010-02-12T02:46:22Z","messageCount":4,"participants":["Jacob Helwig","Michael J Gruber"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"133910","messageId":"1265596587-9949-1-git-send-email-jacob.helwig@gmail.com","threadId":"22565","inReplyTo":null,"subject":"[PATCH] filter-branch: Fix error message for --prune-empty --commit-filter","fromName":"Jacob Helwig","fromEmail":"jacob.helwig@gmail.com","sentAt":"2010-02-08T02:36:27Z","receivedAt":"2010-02-08T02:36:27Z","isPatch":true,"sender":{"key":"jacob.helwig@gmail.com","avatar":"https://avatars.githubusercontent.com/u/14557?v=4"},"body":"Running filter-branch with --prune-empty and --commit-filter, no longer\nincorrectly reports that you had tried to run '--filter-commit' in\ncombination with '--prune-empty'.\n---\n\nThis problem with filter-branch's error message was originally brought up by\nhipe in the IRC channel.\n\n git-filter-branch.sh |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git-filter-branch.sh b/git-filter-branch.sh\nindex e95845c..88fb0f0 100755\n--- a/git-filter-branch.sh\n+++ b/git-filter-branch.sh\n@@ -207,7 +207,7 @@ t,)\n ,*)\n \t;;\n *)\n-\tdie \"Cannot set --prune-empty and --filter-commit at the same time\"\n+\tdie \"Cannot set --prune-empty and --commit-filter at the same time\"\n esac\n \n case \"$force\" in\n-- \n1.7.0.rc1.50.g8424\n"},{"id":"133911","messageId":"1265596681-10561-1-git-send-email-jacob.helwig@gmail.com","threadId":"22565","inReplyTo":"1265596587-9949-1-git-send-email-jacob.helwig@gmail.com","subject":"[PATCH] filter-branch: Fix error message for --prune-empty --commit-filter","fromName":"Jacob Helwig","fromEmail":"jacob.helwig@gmail.com","sentAt":"2010-02-08T02:38:01Z","receivedAt":"2010-02-08T02:38:01Z","isPatch":true,"sender":{"key":"jacob.helwig@gmail.com","avatar":"https://avatars.githubusercontent.com/u/14557?v=4"},"body":"Running filter-branch with --prune-empty and --commit-filter, no longer\nincorrectly reports that you had tried to run '--filter-commit' in\ncombination with '--prune-empty'.\n\nSigned-off-by: Jacob Helwig <jacob.helwig@gmail.com>\n---\n\nSorry for the re-send.  Forgot the SOB...\n\n git-filter-branch.sh |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git-filter-branch.sh b/git-filter-branch.sh\nindex e95845c..88fb0f0 100755\n--- a/git-filter-branch.sh\n+++ b/git-filter-branch.sh\n@@ -207,7 +207,7 @@ t,)\n ,*)\n \t;;\n *)\n-\tdie \"Cannot set --prune-empty and --filter-commit at the same time\"\n+\tdie \"Cannot set --prune-empty and --commit-filter at the same time\"\n esac\n \n case \"$force\" in\n-- \n1.7.0.rc1.50.g8424\n"},{"id":"133917","messageId":"4B6FE325.5000909@drmicha.warpmail.net","threadId":"22565","inReplyTo":"1265596681-10561-1-git-send-email-jacob.helwig@gmail.com","subject":"Re: [PATCH] filter-branch: Fix error message for --prune-empty --commit-filter","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2010-02-08T10:10:45Z","receivedAt":"2010-02-08T10:10:45Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Jacob Helwig venit, vidit, dixit 08.02.2010 03:38:\n> Running filter-branch with --prune-empty and --commit-filter, no longer\n> incorrectly reports that you had tried to run '--filter-commit' in\n> combination with '--prune-empty'.\n\nIn order to understand this sentence, I had to look twice at the patch text.\n\nWhat's going on is that that typo was there from the beginning, right?\n(Induced from the name of a script variable, I see.) How about:\n\nRunning filter-branch with --prune-empty and --commit-filter reports\n\"Cannot set --prune-empty and --filter-commit at the same time\".\n\nChange it to use the correct name \"--commit-filter\" of the option.\n\n\n> Signed-off-by: Jacob Helwig <jacob.helwig@gmail.com>\n> ---\n> \n> Sorry for the re-send.  Forgot the SOB...\n> \n>  git-filter-branch.sh |    2 +-\n>  1 files changed, 1 insertions(+), 1 deletions(-)\n> \n> diff --git a/git-filter-branch.sh b/git-filter-branch.sh\n> index e95845c..88fb0f0 100755\n> --- a/git-filter-branch.sh\n> +++ b/git-filter-branch.sh\n> @@ -207,7 +207,7 @@ t,)\n>  ,*)\n>  \t;;\n>  *)\n> -\tdie \"Cannot set --prune-empty and --filter-commit at the same time\"\n> +\tdie \"Cannot set --prune-empty and --commit-filter at the same time\"\n>  esac\n>  \n>  case \"$force\" in\n"},{"id":"134288","messageId":"1265942782-16257-1-git-send-email-jacob.helwig@gmail.com","threadId":"22565","inReplyTo":"4B6FE325.5000909@drmicha.warpmail.net","subject":"[PATCH] filter-branch: Fix error message for --prune-empty --commit-filter","fromName":"Jacob Helwig","fromEmail":"jacob.helwig@gmail.com","sentAt":"2010-02-12T02:46:22Z","receivedAt":"2010-02-12T02:46:22Z","isPatch":true,"sender":{"key":"jacob.helwig@gmail.com","avatar":"https://avatars.githubusercontent.com/u/14557?v=4"},"body":"Running filter-branch with --prune-empty and --commit-filter reports:\n  \"Cannot set --prune-empty and --filter-commit at the same time\".\n\nChange it to use the correct option name: --commit-filter\n\nSigned-off-by: Jacob Helwig <jacob.helwig@gmail.com>\n---\n\nSorry for taking so long to respond to this.\n\nI wasn't quite happy with the suggested commit message, but hopefully this will\nmake everyone happy.\n\n git-filter-branch.sh |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git-filter-branch.sh b/git-filter-branch.sh\nindex e95845c..88fb0f0 100755\n--- a/git-filter-branch.sh\n+++ b/git-filter-branch.sh\n@@ -207,7 +207,7 @@ t,)\n ,*)\n \t;;\n *)\n-\tdie \"Cannot set --prune-empty and --filter-commit at the same time\"\n+\tdie \"Cannot set --prune-empty and --commit-filter at the same time\"\n esac\n \n case \"$force\" in\n-- \n1.6.6.1\n"}]}