Merge branch 'jk/rev-parse-double-dashes'

"git rev-parse <revs> -- <paths>" did not implement the usual
disambiguation rules the commands in the "git log" family used in
the same way.

* jk/rev-parse-double-dashes:
rev-parse: be more careful with munging arguments
rev-parse: correctly diagnose revision errors before "--"

diff --combined builtin/rev-parse.c
index 6e802fdeb8bce0f7fdce925f47fc239462f6a459,c4b768ffda4cb91dbe01012ccb8eb2475435a77e..aaeb611a9729938251b1c679e35c446bb737ff4f
--- 1/builtin/rev-parse.c
--- 2/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@@ -9,8 -9,6 +9,8 @@@
  #include "quote.h"
  #include "builtin.h"
  #include "parse-options.h"
 +#include "diff.h"
 +#include "revision.h"
  
  #define DO_REVS               1
  #define DO_NOREV      2
@@@ -32,9 -30,6 +32,9 @@@ static int abbrev_ref
  static int abbrev_ref_strict;
  static int output_sq;
  
 +static int stuck_long;
 +static struct string_list *ref_excludes;
 +
  /*
   * Some arguments are relevant "revision" arguments,
   * others are about output format or other details.
@@@ -190,8 -185,6 +190,8 @@@ static int show_default(void
  
  static int show_reference(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
  {
 +      if (ref_excluded(ref_excludes, refname))
 +              return 0;
        show_rev(NORMAL, sha1, refname);
        return 0;
  }
@@@ -286,6 -279,7 +286,7 @@@ static int try_difference(const char *a
                                exclude = n;
                        }
                }
+               *dotdot = '.';
                return 1;
        }
        *dotdot = '.';
@@@ -309,8 -303,10 +310,10 @@@ static int try_parent_shorthands(const 
                return 0;
  
        *dotdot = 0;
-       if (get_sha1_committish(arg, sha1))
+       if (get_sha1_committish(arg, sha1)) {
+               *dotdot = '^';
                return 0;
+       }
  
        if (!parents_only)
                show_rev(NORMAL, sha1, arg);
@@@ -319,6 -315,7 +322,7 @@@
                show_rev(parents_only ? NORMAL : REVERSED,
                                parents->item->object.sha1, arg);
  
+       *dotdot = '^';
        return 1;
  }
  
@@@ -327,15 -324,12 +331,15 @@@ static int parseopt_dump(const struct o
        struct strbuf *parsed = o->value;
        if (unset)
                strbuf_addf(parsed, " --no-%s", o->long_name);
 -      else if (o->short_name)
 +      else if (o->short_name && (o->long_name == NULL || !stuck_long))
                strbuf_addf(parsed, " -%c", o->short_name);
        else
                strbuf_addf(parsed, " --%s", o->long_name);
        if (arg) {
 -              strbuf_addch(parsed, ' ');
 +              if (!stuck_long)
 +                      strbuf_addch(parsed, ' ');
 +              else if (o->long_name)
 +                      strbuf_addch(parsed, '=');
                sq_quote_buf(parsed, arg);
        }
        return 0;
@@@ -361,8 -355,6 +365,8 @@@ static int cmd_parseopt(int argc, cons
                OPT_BOOL(0, "stop-at-non-option", &stop_at_non_option,
                                        N_("stop parsing after the "
                                           "first non-option argument")),
 +              OPT_BOOL(0, "stuck-long", &stuck_long,
 +                                      N_("output in stuck long form")),
                OPT_END(),
        };
  
@@@ -488,6 -480,7 +492,7 @@@ N_("git rev-parse --parseopt [options] 
  int cmd_rev_parse(int argc, const char **argv, const char *prefix)
  {
        int i, as_is = 0, verify = 0, quiet = 0, revs_count = 0, type = 0;
+       int has_dashdash = 0;
        int output_prefix = 0;
        unsigned char sha1[20];
        const char *name = NULL;
@@@ -501,6 -494,13 +506,13 @@@
        if (argc > 1 && !strcmp("-h", argv[1]))
                usage(builtin_rev_parse_usage);
  
+       for (i = 1; i < argc; i++) {
+               if (!strcmp(argv[i], "--")) {
+                       has_dashdash = 1;
+                       break;
+               }
+       }
+ 
        prefix = setup_git_directory();
        git_config(git_default_config, NULL);
        for (i = 1; i < argc; i++) {
@@@ -520,7 -520,7 +532,7 @@@
                        }
                        continue;
                }
 -              if (!prefixcmp(arg, "-n")) {
 +              if (starts_with(arg, "-n")) {
                        if ((filter & DO_FLAGS) && (filter & DO_REVS))
                                show(arg);
                        continue;
@@@ -572,7 -572,7 +584,7 @@@
                                continue;
                        }
                        if (!strcmp(arg, "--short") ||
 -                          !prefixcmp(arg, "--short=")) {
 +                          starts_with(arg, "--short=")) {
                                filter &= ~(DO_FLAGS|DO_NOREV);
                                verify = 1;
                                abbrev = DEFAULT_ABBREV;
@@@ -600,7 -600,7 +612,7 @@@
                                symbolic = SHOW_SYMBOLIC_FULL;
                                continue;
                        }
 -                      if (!prefixcmp(arg, "--abbrev-ref") &&
 +                      if (starts_with(arg, "--abbrev-ref") &&
                            (!arg[12] || arg[12] == '=')) {
                                abbrev_ref = 1;
                                abbrev_ref_strict = warn_ambiguous_refs;
@@@ -618,7 -618,7 +630,7 @@@
                                for_each_ref(show_reference, NULL);
                                continue;
                        }
 -                      if (!prefixcmp(arg, "--disambiguate=")) {
 +                      if (starts_with(arg, "--disambiguate=")) {
                                for_each_abbrev(arg + 15, show_abbrev, NULL);
                                continue;
                        }
@@@ -627,46 -627,35 +639,46 @@@
                                for_each_ref_in("refs/bisect/good", anti_reference, NULL);
                                continue;
                        }
 -                      if (!prefixcmp(arg, "--branches=")) {
 +                      if (starts_with(arg, "--branches=")) {
                                for_each_glob_ref_in(show_reference, arg + 11,
                                        "refs/heads/", NULL);
 +                              clear_ref_exclusion(&ref_excludes);
                                continue;
                        }
                        if (!strcmp(arg, "--branches")) {
                                for_each_branch_ref(show_reference, NULL);
 +                              clear_ref_exclusion(&ref_excludes);
                                continue;
                        }
 -                      if (!prefixcmp(arg, "--tags=")) {
 +                      if (starts_with(arg, "--tags=")) {
                                for_each_glob_ref_in(show_reference, arg + 7,
                                        "refs/tags/", NULL);
 +                              clear_ref_exclusion(&ref_excludes);
                                continue;
                        }
                        if (!strcmp(arg, "--tags")) {
                                for_each_tag_ref(show_reference, NULL);
 +                              clear_ref_exclusion(&ref_excludes);
                                continue;
                        }
 -                      if (!prefixcmp(arg, "--glob=")) {
 +                      if (starts_with(arg, "--glob=")) {
                                for_each_glob_ref(show_reference, arg + 7, NULL);
 +                              clear_ref_exclusion(&ref_excludes);
                                continue;
                        }
 -                      if (!prefixcmp(arg, "--remotes=")) {
 +                      if (starts_with(arg, "--remotes=")) {
                                for_each_glob_ref_in(show_reference, arg + 10,
                                        "refs/remotes/", NULL);
 +                              clear_ref_exclusion(&ref_excludes);
                                continue;
                        }
                        if (!strcmp(arg, "--remotes")) {
                                for_each_remote_ref(show_reference, NULL);
 +                              clear_ref_exclusion(&ref_excludes);
 +                              continue;
 +                      }
 +                      if (starts_with(arg, "--exclude=")) {
 +                              add_ref_exclusion(&ref_excludes, arg + 10);
                                continue;
                        }
                        if (!strcmp(arg, "--local-env-vars")) {
@@@ -747,19 -736,19 +759,19 @@@
                                                : "false");
                                continue;
                        }
 -                      if (!prefixcmp(arg, "--since=")) {
 +                      if (starts_with(arg, "--since=")) {
                                show_datestring("--max-age=", arg+8);
                                continue;
                        }
 -                      if (!prefixcmp(arg, "--after=")) {
 +                      if (starts_with(arg, "--after=")) {
                                show_datestring("--max-age=", arg+8);
                                continue;
                        }
 -                      if (!prefixcmp(arg, "--before=")) {
 +                      if (starts_with(arg, "--before=")) {
                                show_datestring("--min-age=", arg+9);
                                continue;
                        }
 -                      if (!prefixcmp(arg, "--until=")) {
 +                      if (starts_with(arg, "--until=")) {
                                show_datestring("--min-age=", arg+8);
                                continue;
                        }
@@@ -788,6 -777,8 +800,8 @@@
                }
                if (verify)
                        die_no_single_rev(quiet);
+               if (has_dashdash)
+                       die("bad revision '%s'", arg);
                as_is = 1;
                if (!show_file(arg, output_prefix))
                        continue;