From: Jacob Helwig <jacob.helwig@gmail.com>
To: git@vger.kernel.org
Cc: Jacob Helwig <jacob.helwig@gmail.com>
Subject: [PATCH] filter-branch: Fix error message for --prune-empty --commit-filter
Date: Sun, 7 Feb 2010 18:36:27 -0800 [thread overview]
Message-ID: <1265596587-9949-1-git-send-email-jacob.helwig@gmail.com> (raw)
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(-)
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
next reply other threads:[~2010-02-08 2:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-08 2:36 Jacob Helwig [this message]
2010-02-08 2:38 ` [PATCH] filter-branch: Fix error message for --prune-empty --commit-filter Jacob Helwig
2010-02-08 10:10 ` Michael J Gruber
2010-02-12 2:46 ` Jacob Helwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1265596587-9949-1-git-send-email-jacob.helwig@gmail.com \
--to=jacob.helwig@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).