show-ref: allow -d to work with --verify

Move handling of -d into show_one(), so that it takes effect when
--verify is present as well as when it is absent. This is useful when
the user wishes to avoid the costly iteration of refs.

Signed-off-by: Vladimir Panteleev <git@thecybershadow.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index 0e53e3da4f19f0710de9d01d2bcb3e7c1883ee52..a72a626b18612b229e164a47823ceac3ebd9d5dc 100644 (file)
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -19,19 +19,27 @@ static const char *exclude_existing_arg;
 
 static void show_one(const char *refname, const struct object_id *oid)
 {
 
 static void show_one(const char *refname, const struct object_id *oid)
 {

-       const char *hex = find_unique_abbrev(oid->hash, abbrev);
+       const char *hex;
+       struct object_id peeled;
+
+       hex = find_unique_abbrev(oid->hash, abbrev);

        if (hash_only)
                printf("%s\n", hex);
        else
                printf("%s %s\n", hex, refname);
        if (hash_only)
                printf("%s\n", hex);
        else
                printf("%s %s\n", hex, refname);

+
+       if (!deref_tags)
+               return;
+
+       if (!peel_ref(refname, peeled.hash)) {
+               hex = find_unique_abbrev(peeled.hash, abbrev);
+               printf("%s %s^{}\n", hex, refname);
+       }

 }
 
 static int show_ref(const char *refname, const struct object_id *oid,
                    int flag, void *cbdata)
 {
 }
 
 static int show_ref(const char *refname, const struct object_id *oid,
                    int flag, void *cbdata)
 {

-       const char *hex;
-       struct object_id peeled;
-

        if (show_head && !strcmp(refname, "HEAD"))
                goto match;
 
        if (show_head && !strcmp(refname, "HEAD"))
                goto match;
 


@@ -79,13 +87,6 @@ static int show_ref(const char *refname, const struct object_id *oid,
 
        show_one(refname, oid);
 
 
        show_one(refname, oid);
 

-       if (!deref_tags)
-               return 0;
-
-       if (!peel_ref(refname, peeled.hash)) {
-               hex = find_unique_abbrev(peeled.hash, abbrev);
-               printf("%s %s^{}\n", hex, refname);
-       }

        return 0;
 }
 
        return 0;
 }
 

diff --git a/t/t1403-show-ref.sh b/t/t1403-show-ref.sh
index 5932beada145c5f5ee41fac47e72d707e84d6f15..c6872bd96f03c6e08d55373be9695a17e5bb75ca 100755 (executable)
--- a/t/t1403-show-ref.sh
+++ b/t/t1403-show-ref.sh
@@ -97,6 +97,9 @@ test_expect_success 'show-ref -d' '
        git show-ref -d refs/tags/A refs/tags/C >actual &&
        test_cmp expect actual &&
 
        git show-ref -d refs/tags/A refs/tags/C >actual &&
        test_cmp expect actual &&
 

+       git show-ref --verify -d refs/tags/A refs/tags/C >actual &&
+       test_cmp expect actual &&
+

        echo $(git rev-parse refs/heads/master) refs/heads/master >expect &&
        git show-ref -d master >actual &&
        test_cmp expect actual &&
        echo $(git rev-parse refs/heads/master) refs/heads/master >expect &&
        git show-ref -d master >actual &&
        test_cmp expect actual &&


@@ -116,6 +119,12 @@ test_expect_success 'show-ref -d' '
        test_cmp expect actual &&
 
        test_must_fail git show-ref -d --verify heads/master >actual &&
        test_cmp expect actual &&
 
        test_must_fail git show-ref -d --verify heads/master >actual &&

+       test_cmp expect actual &&
+
+       test_must_fail git show-ref --verify -d A C >actual &&
+       test_cmp expect actual &&
+
+       test_must_fail git show-ref --verify -d tags/A tags/C >actual &&

        test_cmp expect actual
 
 '
        test_cmp expect actual
 
 '