From: Michael Haggerty <mhagger@alum.mit.edu>
To: gitster@pobox.com
Cc: git@vger.kernel.org, Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH v2 13/19] git-check-attr: Handle each error separately
Date: Thu, 28 Jul 2011 06:46:52 +0200 [thread overview]
Message-ID: <1311828418-2676-14-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1311828418-2676-1-git-send-email-mhagger@alum.mit.edu>
This will make the code easier to refactor.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
builtin/check-attr.c | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/builtin/check-attr.c b/builtin/check-attr.c
index d004222..de3fef7 100644
--- a/builtin/check-attr.c
+++ b/builtin/check-attr.c
@@ -78,7 +78,6 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)
{
struct git_attr_check *check;
int cnt, i, doubledash, filei;
- const char *errstr = NULL;
argc = parse_options(argc, argv, prefix, check_attr_options,
check_attr_usage, PARSE_OPT_KEEP_DASHDASH);
@@ -105,12 +104,10 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)
}
if (cnt <= 0)
- errstr = "No attribute specified";
- else if (stdin_paths && filei < argc)
- errstr = "Can't specify files with --stdin";
- if (errstr) {
- error_with_usage(errstr);
- }
+ error_with_usage("No attribute specified");
+
+ if (stdin_paths && filei < argc)
+ error_with_usage("Can't specify files with --stdin");
check = xcalloc(cnt, sizeof(*check));
for (i = 0; i < cnt; i++) {
--
1.7.6.8.gd2879
next prev parent reply other threads:[~2011-07-28 4:55 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-28 4:46 [PATCH v2 00/19] Add --all option to git-check-attr Michael Haggerty
2011-07-28 4:46 ` [PATCH v2 01/19] doc: Add a link from gitattributes(5) to git-check-attr(1) Michael Haggerty
2011-07-28 4:46 ` [PATCH v2 02/19] doc: Correct git_attr() calls in example code Michael Haggerty
2011-07-28 4:46 ` [PATCH v2 03/19] Remove anachronism from comment Michael Haggerty
2011-07-28 4:46 ` [PATCH v2 04/19] Disallow the empty string as an attribute name Michael Haggerty
2011-07-28 4:46 ` [PATCH v2 05/19] git-check-attr: Add missing "&&" Michael Haggerty
2011-07-28 4:46 ` [PATCH v2 06/19] git-check-attr: Add tests of command-line parsing Michael Haggerty
2011-07-28 4:46 ` [PATCH v2 07/19] Provide access to the name attribute of git_attr Michael Haggerty
2011-07-28 4:46 ` [PATCH v2 08/19] git-check-attr: Use git_attr_name() Michael Haggerty
2011-07-28 4:46 ` [PATCH v2 09/19] Allow querying all attributes on a file Michael Haggerty
2011-08-02 15:34 ` Junio C Hamano
2011-08-04 3:16 ` Michael Haggerty
2011-07-28 4:46 ` [PATCH v2 10/19] git-check-attr: Extract a function output_attr() Michael Haggerty
2011-07-28 4:46 ` [PATCH v2 11/19] git-check-attr: Introduce a new variable Michael Haggerty
2011-07-28 4:46 ` [PATCH v2 12/19] git-check-attr: Extract a function error_with_usage() Michael Haggerty
2011-07-28 4:46 ` Michael Haggerty [this message]
2011-07-28 4:46 ` [PATCH v2 14/19] git-check-attr: Process command-line args more systematically Michael Haggerty
2011-07-28 4:46 ` [PATCH v2 15/19] git-check-attr: Error out if no pathnames are specified Michael Haggerty
2011-07-28 4:46 ` [PATCH v2 16/19] git-check-attr: Add an --all option to show all attributes Michael Haggerty
2011-07-28 4:46 ` [PATCH v2 17/19] git-check-attr: Drive two tests using the same raw data Michael Haggerty
2011-07-28 4:46 ` [PATCH v2 18/19] git-check-attr: Fix command-line handling to match docs Michael Haggerty
2011-07-28 4:46 ` [PATCH v2 19/19] Rename struct git_attr_check to git_attr_value Michael Haggerty
2011-08-02 15:46 ` Junio C Hamano
2011-08-04 3:20 ` Michael Haggerty
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=1311828418-2676-14-git-send-email-mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).