refs: fix some exclude patterns being ignored

`--exclude` from rev-list and rev-parse fails to exclude references if
the next `--branches`, `--tags` or `--remotes` use the optional
inclusive glob because those options are implemented as particular cases
of `--glob=`, which itself requires that exclude patterns begin with
'refs/'.

But it makes sense for `--branches=glob` and friends to be aware that
exclusions patterns for them shouldn't be 'refs/<type>/' prefixed, the
same way exclude patterns for `--branches` and friends (without the
optional glob) already are.

Let's record in 'refs.c:struct ref_filter' which context the exclude
pattern is tied to, so refs.c:filter_refs() can decide if it should
ignore the prefix when trying to match.

Signed-off-by: Rafael Ascensão <rafa.almas@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/refs.c b/refs.c
index de81c7be7ca8d3ca033b34a61f33b0bff069932f..539f385f61c94f4d5434ac6c2b5dbe1fb5ebcc73 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -217,6 +217,7 @@ char *resolve_refdup(const char *refname, int resolve_flags,
 /* The argument to filter_refs */
 struct ref_filter {
        const char *pattern;
 /* The argument to filter_refs */
 struct ref_filter {
        const char *pattern;

+       const char *prefix;

        each_ref_fn *fn;
        void *cb_data;
 };
        each_ref_fn *fn;
        void *cb_data;
 };


@@ -296,6 +297,8 @@ static int filter_refs(const char *refname, const struct object_id *oid,
 
        if (wildmatch(filter->pattern, refname, 0))
                return 0;
 
        if (wildmatch(filter->pattern, refname, 0))
                return 0;

+       if (filter->prefix)
+               skip_prefix(refname, filter->prefix, &refname);

        return filter->fn(refname, oid, flags, filter->cb_data);
 }
 
        return filter->fn(refname, oid, flags, filter->cb_data);
 }
 


@@ -458,6 +461,7 @@ int for_each_glob_ref_in(each_ref_fn fn, const char *pattern,
        }
 
        filter.pattern = real_pattern.buf;
        }
 
        filter.pattern = real_pattern.buf;

+       filter.prefix = prefix;

        filter.fn = fn;
        filter.cb_data = cb_data;
        ret = for_each_ref(filter_refs, &filter);
        filter.fn = fn;
        filter.cb_data = cb_data;
        ret = for_each_ref(filter_refs, &filter);

diff --git a/t/t6018-rev-list-glob.sh b/t/t6018-rev-list-glob.sh
index 8e2b136356888ab131247ec9f1f11c109075b27b..7dc6cbdc421d83e6cd83823ef0c8b199fee6d19c 100755 (executable)
--- a/t/t6018-rev-list-glob.sh
+++ b/t/t6018-rev-list-glob.sh
@@ -147,51 +147,51 @@ test_expect_success 'rev-parse accumulates multiple --exclude' '
        compare rev-parse "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
 '
 
        compare rev-parse "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
 '
 

-test_expect_failure 'rev-parse --exclude=glob with --branches=glob' '
+test_expect_success 'rev-parse --exclude=glob with --branches=glob' '

        compare rev-parse "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
 '
 
        compare rev-parse "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
 '
 

-test_expect_failure 'rev-parse --exclude=glob with --tags=glob' '
+test_expect_success 'rev-parse --exclude=glob with --tags=glob' '

        compare rev-parse "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
 '
 
        compare rev-parse "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
 '
 

-test_expect_failure 'rev-parse --exclude=glob with --remotes=glob' '
+test_expect_success 'rev-parse --exclude=glob with --remotes=glob' '

        compare rev-parse "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
 '
 
        compare rev-parse "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
 '
 

-test_expect_failure 'rev-parse --exclude=ref with --branches=glob' '
+test_expect_success 'rev-parse --exclude=ref with --branches=glob' '

        compare rev-parse "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
 '
 
        compare rev-parse "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
 '
 

-test_expect_failure 'rev-parse --exclude=ref with --tags=glob' '
+test_expect_success 'rev-parse --exclude=ref with --tags=glob' '

        compare rev-parse "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
 '
 
        compare rev-parse "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
 '
 

-test_expect_failure 'rev-parse --exclude=ref with --remotes=glob' '
+test_expect_success 'rev-parse --exclude=ref with --remotes=glob' '

        compare rev-parse "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
 '
 
        compare rev-parse "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
 '
 

-test_expect_failure 'rev-list --exclude=glob with --branches=glob' '
+test_expect_success 'rev-list --exclude=glob with --branches=glob' '

        compare rev-list "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
 '
 
        compare rev-list "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
 '
 

-test_expect_failure 'rev-list --exclude=glob with --tags=glob' '
+test_expect_success 'rev-list --exclude=glob with --tags=glob' '

        compare rev-list "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
 '
 
        compare rev-list "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
 '
 

-test_expect_failure 'rev-list --exclude=glob with --remotes=glob' '
+test_expect_success 'rev-list --exclude=glob with --remotes=glob' '

        compare rev-list "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
 '
 
        compare rev-list "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
 '
 

-test_expect_failure 'rev-list --exclude=ref with --branches=glob' '
+test_expect_success 'rev-list --exclude=ref with --branches=glob' '

        compare rev-list "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
 '
 
        compare rev-list "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
 '
 

-test_expect_failure 'rev-list --exclude=ref with --tags=glob' '
+test_expect_success 'rev-list --exclude=ref with --tags=glob' '

        compare rev-list "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
 '
 
        compare rev-list "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
 '
 

-test_expect_failure 'rev-list --exclude=ref with --remotes=glob' '
+test_expect_success 'rev-list --exclude=ref with --remotes=glob' '

        compare rev-list "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
 '
 
        compare rev-list "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
 '