Merge branch 'km/delete-ref-reflog-message'

diff --git a/builtin/grep.c b/builtin/grep.c
index 461347adb07a3e504e7c0719cd3e39ed08cadd02..9304c33e75051baa65ee02d1daa03c361e25339e 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -967,6 +967,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
        int dummy;
        int use_index = 1;
        int pattern_type_arg = GREP_PATTERN_TYPE_UNSPECIFIED;
+       int allow_revs;
 
        struct option options[] = {
                OPT_BOOL(0, "cached", &cached,
@@ -1149,7 +1150,23 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 
        compile_grep_patterns(&opt);
 
-       /* Check revs and then paths */
+       /*
+        * We have to find "--" in a separate pass, because its presence
+        * influences how we will parse arguments that come before it.
+        */
+       for (i = 0; i < argc; i++) {
+               if (!strcmp(argv[i], "--")) {
+                       seen_dashdash = 1;
+                       break;
+               }
+       }
+
+       /*
+        * Resolve any rev arguments. If we have a dashdash, then everything up
+        * to it must resolve as a rev. If not, then we stop at the first
+        * non-rev and assume everything else is a path.
+        */
+       allow_revs = use_index && !untracked;
        for (i = 0; i < argc; i++) {
                const char *arg = argv[i];
                unsigned char sha1[20];
@@ -1158,13 +1175,20 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 
                if (!strcmp(arg, "--")) {
                        i++;
-                       seen_dashdash = 1;
                        break;
                }
 
-               /* Stop at the first non-rev */
-               if (get_sha1_with_context(arg, 0, sha1, &oc))
+               if (!allow_revs) {
+                       if (seen_dashdash)
+                               die(_("--no-index or --untracked cannot be used with revs"));
+                       break;
+               }
+
+               if (get_sha1_with_context(arg, 0, sha1, &oc)) {
+                       if (seen_dashdash)
+                               die(_("unable to resolve revision: %s"), arg);
                        break;
+               }
 
                object = parse_object_or_die(sha1, arg);
                if (!seen_dashdash)
@@ -1172,11 +1196,14 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
                add_object_array_with_path(object, arg, &list, oc.mode, oc.path);
        }
 
-       /* The rest are paths */
+       /*
+        * Anything left over is presumed to be a path. But in the non-dashdash
+        * "do what I mean" case, we verify and complain when that isn't true.
+        */
        if (!seen_dashdash) {
                int j;
                for (j = i; j < argc; j++)
-                       verify_filename(prefix, argv[j], j == i);
+                       verify_filename(prefix, argv[j], j == i && allow_revs);
        }
 
        parse_pathspec(&pathspec, 0,
@@ -1248,8 +1275,6 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 
        if (!use_index || untracked) {
                int use_exclude = (opt_exclude < 0) ? use_index : !!opt_exclude;
-               if (list.nr)
-                       die(_("--no-index or --untracked cannot be used with revs."));
                hit = grep_directory(&opt, &pathspec, use_exclude, use_index);
        } else if (0 <= opt_exclude) {
                die(_("--[no-]exclude-standard cannot be used for tracked contents."));