revision.c: the "log" family, except for "show", takes committish

Add a field to setup_revision_opt structure and allow these callers
to tell the setup_revisions command parsing machinery that short SHA1
it encounters are meant to name committish.

This step does not go all the way to connect the setup_revisions()
to sha1_name.c yet.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/log.c b/builtin/log.c
index 7d1f6f88a0e0f76bc8ee35155a532b641c14a845..9363f3929c1f3d5ac72ca498ada21f368f91072a 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -363,6 +363,7 @@ int cmd_whatchanged(int argc, const char **argv, const char *prefix)
        rev.simplify_history = 0;
        memset(&opt, 0, sizeof(opt));
        opt.def = "HEAD";
        rev.simplify_history = 0;
        memset(&opt, 0, sizeof(opt));
        opt.def = "HEAD";

+       opt.revarg_opt = REVARG_COMMITTISH;

        cmd_log_init(argc, argv, prefix, &rev, &opt);
        if (!rev.diffopt.output_format)
                rev.diffopt.output_format = DIFF_FORMAT_RAW;
        cmd_log_init(argc, argv, prefix, &rev, &opt);
        if (!rev.diffopt.output_format)
                rev.diffopt.output_format = DIFF_FORMAT_RAW;


@@ -543,6 +544,7 @@ int cmd_log(int argc, const char **argv, const char *prefix)
        rev.always_show_header = 1;
        memset(&opt, 0, sizeof(opt));
        opt.def = "HEAD";
        rev.always_show_header = 1;
        memset(&opt, 0, sizeof(opt));
        opt.def = "HEAD";

+       opt.revarg_opt = REVARG_COMMITTISH;

        cmd_log_init(argc, argv, prefix, &rev, &opt);
        return cmd_log_walk(&rev);
 }
        cmd_log_init(argc, argv, prefix, &rev, &opt);
        return cmd_log_walk(&rev);
 }


@@ -1144,6 +1146,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
        rev.subject_prefix = fmt_patch_subject_prefix;
        memset(&s_r_opt, 0, sizeof(s_r_opt));
        s_r_opt.def = "HEAD";
        rev.subject_prefix = fmt_patch_subject_prefix;
        memset(&s_r_opt, 0, sizeof(s_r_opt));
        s_r_opt.def = "HEAD";

+       s_r_opt.revarg_opt = REVARG_COMMITTISH;

 
        if (default_attach) {
                rev.mime_boundary = default_attach;
 
        if (default_attach) {
                rev.mime_boundary = default_attach;

diff --git a/revision.c b/revision.c
index 929497f0134e465836750fcd1938ceb765eba807..ec6f0c8936a610be206ac88745ad91d94349a979 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -1102,6 +1102,7 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsi
        int local_flags;
        const char *arg = arg_;
        int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;
        int local_flags;
        const char *arg = arg_;
        int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;

+       unsigned get_sha1_flags = 0;

 
        dotdot = strstr(arg, "..");
        if (dotdot) {
 
        dotdot = strstr(arg, "..");
        if (dotdot) {


@@ -1179,7 +1180,11 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsi
                local_flags = UNINTERESTING;
                arg++;
        }
                local_flags = UNINTERESTING;
                arg++;
        }

-       if (get_sha1_with_context(arg, 0, sha1, &oc))
+
+       if (revarg_opt & REVARG_COMMITTISH)
+               get_sha1_flags = GET_SHA1_COMMITTISH;
+
+       if (get_sha1_with_context(arg, get_sha1_flags, sha1, &oc))

                return revs->ignore_missing ? 0 : -1;
        if (!cant_be_filename)
                verify_non_filename(revs->prefix, arg);
                return revs->ignore_missing ? 0 : -1;
        if (!cant_be_filename)
                verify_non_filename(revs->prefix, arg);


@@ -1707,7 +1712,9 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 
        /* Second, deal with arguments and options */
        flags = 0;
 
        /* Second, deal with arguments and options */
        flags = 0;

-       revarg_opt = seen_dashdash ? REVARG_CANNOT_BE_FILENAME : 0;
+       revarg_opt = opt ? opt->revarg_opt : 0;
+       if (seen_dashdash)
+               revarg_opt |= REVARG_CANNOT_BE_FILENAME;

        read_from_stdin = 0;
        for (left = i = 1; i < argc; i++) {
                const char *arg = argv[i];
        read_from_stdin = 0;
        for (left = i = 1; i < argc; i++) {
                const char *arg = argv[i];

diff --git a/revision.h b/revision.h
index 8eceaec65db95cc02122cab5693478e8dee5f9fe..402f10d0af6df98365170559cd15fd9d12aa9c61 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -183,6 +183,7 @@ struct setup_revision_opt {
        const char *def;
        void (*tweak)(struct rev_info *, struct setup_revision_opt *);
        const char *submodule;
        const char *def;
        void (*tweak)(struct rev_info *, struct setup_revision_opt *);
        const char *submodule;

+       unsigned revarg_opt;

 };
 
 extern void init_revisions(struct rev_info *revs, const char *prefix);
 };
 
 extern void init_revisions(struct rev_info *revs, const char *prefix);


@@ -191,6 +192,7 @@ extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ct
                                 const struct option *options,
                                 const char * const usagestr[]);
 #define REVARG_CANNOT_BE_FILENAME 01
                                 const struct option *options,
                                 const char * const usagestr[]);
 #define REVARG_CANNOT_BE_FILENAME 01

+#define REVARG_COMMITTISH 02

 extern int handle_revision_arg(const char *arg, struct rev_info *revs, int flags, unsigned revarg_opt);
 
 extern int prepare_revision_walk(struct rev_info *revs);
 extern int handle_revision_arg(const char *arg, struct rev_info *revs, int flags, unsigned revarg_opt);
 
 extern int prepare_revision_walk(struct rev_info *revs);

diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh
index 6f87d8ea9d7dc17b1e3f41f457e8d4605fc4526d..da25fad92452906199d411a9d825ecd1ba973f09 100755 (executable)
--- a/t/t1512-rev-parse-disambiguation.sh
+++ b/t/t1512-rev-parse-disambiguation.sh
@@ -117,7 +117,7 @@ test_expect_failure 'rev-parse name1..name2 takes only commit-ishes on both ends
        git rev-parse 000000000..
 '
 
        git rev-parse 000000000..
 '
 

-test_expect_failure 'git log takes only commit-ish' '
+test_expect_success 'git log takes only commit-ish' '

        git log 000000000
 '
 
        git log 000000000
 '