so that git-describe searches first-parent history only when looking for
a named commit. This is useful for describing commits by tags on their
"main" (first-parent) branch; for example, on git.git:

git describe 22ffc39
v1.7.2.3-223-g22ffc39

git describe --first-parent 22ffc39
v1.7.2-104-g22ffc39

git describe --contains --first-parent is forbidden because git name-rev
(which is called by that) favors first-parent transversal already,
although not strictly so.

Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net>
---
 builtin/describe.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/builtin/describe.c b/builtin/describe.c
index 9fe11ed..aa60f5c 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -25,6 +25,7 @@ static int abbrev = -1; /* unspecified */
 static int max_candidates = 10;
 static struct hash_table names;
 static int have_util;
+static int first_parent;
 static const char *pattern;
 static int always;
 static const char *dirty;
@@ -336,7 +337,7 @@ static void describe(const char *arg, int last_one)
                        if (!(p->object.flags & SEEN))
                                commit_list_insert_by_date(p, &list);
                        p->object.flags |= c->object.flags;
-                       parents = parents->next;
+                       parents = first_parent ? NULL : parents->next;
                }
        }
 
@@ -414,6 +415,8 @@ int cmd_describe(int argc, const char **argv, const char 
*prefix)
                           N_("only consider tags matching <pattern>")),
                OPT_BOOLEAN(0, "always",     &always,
                           N_("show abbreviated commit object as fallback")),
+               OPT_BOOLEAN(0, "first-parent",     &first_parent,
+                          "follow first parents only"),
                {OPTION_STRING, 0, "dirty",  &dirty, N_("mark"),
                           N_("append <mark> on dirty working tree (default: 
\"-dirty\")"),
                 PARSE_OPT_OPTARG, NULL, (intptr_t) "-dirty"},
@@ -435,6 +438,9 @@ int cmd_describe(int argc, const char **argv, const char 
*prefix)
        if (longformat && abbrev == 0)
                die(_("--long is incompatible with --abbrev=0"));
 
+       if (contains && first_parent)
+               die(_("--contains is incompatible with --first-parent"));
+
        if (contains) {
                const char **args = xmalloc((7 + argc) * sizeof(char *));
                int i = 0;
-- 
1.7.12.463.gbd9d638

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to