git-tag: Fix -l option to use better shell style globs.

This patch removes certain behaviour of "git tag -l foo", currently
listing every tag name having "foo" as a substring.  The same
thing now could be achieved doing "git tag -l '*foo*'".

This feature was added recently when git-tag.sh got the -n option
for showing tag annotations, because that commit also replaced the
old "grep pattern" behaviour with a more preferable "shell pattern"
behaviour (although slightly modified as you can see).
Thus, the following builtin-tag.c implemented it in order to
ensure that tests were passing unchanged with both programs.

Since common "shell patterns" match names with a given substring
_only_ when * is inserted before and after (as in "*substring*"), and
the "plain" behaviour cannot be achieved easily with the current
implementation, this is mostly the right thing to do, in order to
make it more flexible and consistent.

Tests for "git tag" were also changed to reflect this.

Signed-off-by: Carlos Rica <jasampler@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-tag.c b/builtin-tag.c
index d6d38ad123cb0f354a6bd7007eddf8fb1b4d126c..348919cff8645c81ac803a34c967ba34f9b982b4 100644 (file)
--- a/builtin-tag.c
+++ b/builtin-tag.c
@@ -123,22 +123,15 @@ static int show_reference(const char *refname, const unsigned char *sha1,
 static int list_tags(const char *pattern, int lines)
 {
        struct tag_filter filter;
 static int list_tags(const char *pattern, int lines)
 {
        struct tag_filter filter;

-       char *newpattern;

 
        if (pattern == NULL)
 
        if (pattern == NULL)

-               pattern = "";
+               pattern = "*";

 
 

-       /* prepend/append * to the shell pattern: */
-       newpattern = xmalloc(strlen(pattern) + 3);
-       sprintf(newpattern, "*%s*", pattern);
-
-       filter.pattern = newpattern;
+       filter.pattern = pattern;

        filter.lines = lines;
 
        for_each_tag_ref(show_reference, (void *) &filter);
 
        filter.lines = lines;
 
        for_each_tag_ref(show_reference, (void *) &filter);
 

-       free(newpattern);
-

        return 0;
 }
 
        return 0;
 }
 

diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index c4fa4461f764dd936f231dae3905605b0ed0c28a..606d4f2a2c3e771c188294ae92d58cf2a38e14fb 100755 (executable)
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -185,18 +185,17 @@ cba
 EOF
 test_expect_success \
        'listing tags with substring as pattern must print those matching' '
 EOF
 test_expect_success \
        'listing tags with substring as pattern must print those matching' '

-       git-tag -l a > actual &&
+       git-tag -l "*a*" > actual &&

        git diff expect actual
 '
 
 cat >expect <<EOF
 v0.2.1
 v1.0.1
        git diff expect actual
 '
 
 cat >expect <<EOF
 v0.2.1
 v1.0.1

-v1.1.3

 EOF
 test_expect_success \
 EOF
 test_expect_success \

-       'listing tags with substring as pattern must print those matching' '
-       git-tag -l .1 > actual &&
+       'listing tags with a suffix as pattern must print those matching' '
+       git-tag -l "*.1" > actual &&

        git diff expect actual
 '
 
        git diff expect actual
 '
 


@@ -205,37 +204,36 @@ t210
 t211
 EOF
 test_expect_success \
 t211
 EOF
 test_expect_success \

-       'listing tags with substring as pattern must print those matching' '
-       git-tag -l t21 > actual &&
+       'listing tags with a prefix as pattern must print those matching' '
+       git-tag -l "t21*" > actual &&

        git diff expect actual
 '
 
 cat >expect <<EOF
 a1
        git diff expect actual
 '
 
 cat >expect <<EOF
 a1

-aa1

 EOF
 test_expect_success \
 EOF
 test_expect_success \

-       'listing tags using a name as pattern must print those matching' '
+       'listing tags using a name as pattern must print that one matching' '

        git-tag -l a1 > actual &&
        git diff expect actual
 '
 
 cat >expect <<EOF
 v1.0
        git-tag -l a1 > actual &&
        git diff expect actual
 '
 
 cat >expect <<EOF
 v1.0

-v1.0.1

 EOF
 test_expect_success \
 EOF
 test_expect_success \

-       'listing tags using a name as pattern must print those matching' '
+       'listing tags using a name as pattern must print that one matching' '

        git-tag -l v1.0 > actual &&
        git diff expect actual
 '
 
 cat >expect <<EOF
        git-tag -l v1.0 > actual &&
        git diff expect actual
 '
 
 cat >expect <<EOF

+v1.0.1

 v1.1.3
 EOF
 test_expect_success \
        'listing tags with ? in the pattern should print those matching' '
 v1.1.3
 EOF
 test_expect_success \
        'listing tags with ? in the pattern should print those matching' '

-       git-tag -l "1.1?" > actual &&
+       git-tag -l "v1.?.?" > actual &&

        git diff expect actual
 '
 
        git diff expect actual
 '