From: Michael Haggerty <mhagger@alum.mit.edu>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH 18/19] git-check-attr: Fix command-line handling to match docs
Date: Tue, 26 Jul 2011 16:13:01 +0200 [thread overview]
Message-ID: <1311689582-3116-19-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1311689582-3116-1-git-send-email-mhagger@alum.mit.edu>
According to the git-check-attr synopsis, if the '--stdin' option is
used then no pathnames are expected on the command line. Change the
behavior to match this description; namely, if '--stdin' is used but
not '--', then treat all command-line arguments as attribute names.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
Previously, such invocations either had exactly one argument (and
functioned the same as with this patch), or they failed with the
message "Can't specify files with --stdin".
Documentation/git-check-attr.txt | 7 +++++--
builtin/check-attr.c | 15 +++++++++------
t/t0003-attributes.sh | 1 -
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/Documentation/git-check-attr.txt b/Documentation/git-check-attr.txt
index 3afa9b1..902d5ca 100644
--- a/Documentation/git-check-attr.txt
+++ b/Documentation/git-check-attr.txt
@@ -33,8 +33,11 @@ OPTIONS
\--::
Interpret all preceding arguments as attributes and all following
- arguments as path names. If not supplied, only the first argument will
- be treated as an attribute.
+ arguments as path names.
+
+If none of `--stdin`, `--all`, or `--` is used, the first argument
+will be treated as an attribute and the rest of the arguments as
+pathnames.
OUTPUT
------
diff --git a/builtin/check-attr.c b/builtin/check-attr.c
index ecf420f..29613d4 100644
--- a/builtin/check-attr.c
+++ b/builtin/check-attr.c
@@ -111,15 +111,18 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)
} else if (doubledash == 0) {
error_with_usage("No attribute specified");
} else if (doubledash < 0) {
- /*
- * There is no double dash; treat the first
- * argument as an attribute.
- */
if (!argc)
error_with_usage("No attribute specified");
- cnt = 1;
- filei = 1;
+ if (stdin_paths) {
+ /* Treat all arguments as attribute names. */
+ cnt = argc;
+ filei = argc;
+ } else {
+ /* Treat exactly one argument as an attribute name. */
+ cnt = 1;
+ filei = 1;
+ }
} else {
cnt = doubledash;
filei = doubledash + 1;
diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh
index a49f8a9..5acb2d5 100755
--- a/t/t0003-attributes.sh
+++ b/t/t0003-attributes.sh
@@ -70,7 +70,6 @@ test_expect_success 'command line checks' '
echo "f" | test_must_fail git check-attr --stdin &&
echo "f" | test_must_fail git check-attr --stdin -- f &&
echo "f" | test_must_fail git check-attr --stdin test -- f &&
- echo "f" | test_must_fail git check-attr --stdin test f &&
test_must_fail git check-attr "" -- f
'
--
1.7.6.8.gd2879
next prev parent reply other threads:[~2011-07-26 14:35 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-26 14:12 [PATCH 00/19] Add --all option to git-check-attr Michael Haggerty
2011-07-26 14:12 ` [PATCH 01/19] doc: Add a link from gitattributes(5) to git-check-attr(1) Michael Haggerty
2011-07-26 14:12 ` [PATCH 02/19] doc: Correct git_attr() calls in example code Michael Haggerty
2011-07-26 14:12 ` [PATCH 03/19] Remove anachronism from comment Michael Haggerty
2011-07-26 14:12 ` [PATCH 04/19] Disallow the empty string as an attribute name Michael Haggerty
2011-07-27 20:20 ` Junio C Hamano
2011-07-26 14:12 ` [PATCH 05/19] git-check-attr: Add missing "&&" Michael Haggerty
2011-07-26 14:12 ` [PATCH 06/19] git-check-attr: Add tests of command-line parsing Michael Haggerty
2011-07-26 14:12 ` [PATCH 07/19] Provide access to the name attribute of git_attr Michael Haggerty
2011-07-27 20:02 ` Junio C Hamano
2011-07-28 4:27 ` Michael Haggerty
2011-07-26 14:12 ` [PATCH 08/19] git-check-attr: Use git_attr_name() Michael Haggerty
2011-07-26 14:12 ` [PATCH 09/19] Allow querying all attributes on a file Michael Haggerty
2011-07-26 14:12 ` [PATCH 10/19] git-check-attr: Extract a function output_attr() Michael Haggerty
2011-07-26 14:12 ` [PATCH 11/19] git-check-attr: Introduce a new variable Michael Haggerty
2011-07-26 14:12 ` [PATCH 12/19] git-check-attr: Extract a function error_with_usage() Michael Haggerty
2011-07-26 14:12 ` [PATCH 13/19] git-check-attr: Handle each error separately Michael Haggerty
2011-07-26 14:12 ` [PATCH 14/19] git-check-attr: Process command-line args more systematically Michael Haggerty
2011-07-26 14:12 ` [PATCH 15/19] git-check-attr: Error out if no pathnames are specified Michael Haggerty
2011-07-26 14:12 ` [PATCH 16/19] git-check-attr: Add an --all option to show all attributes Michael Haggerty
2011-07-28 4:31 ` Michael Haggerty
2011-07-26 14:13 ` [PATCH 17/19] git-check-attr: Drive two tests using the same raw data Michael Haggerty
2011-07-26 14:13 ` Michael Haggerty [this message]
2011-07-26 14:13 ` [PATCH 19/19] Rename struct git_attr_check to git_attr_value 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=1311689582-3116-19-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).