undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ra/rev-parse-exclude-glob'

Browse Source 
"rev-parse --exclude=<pattern> --branches=<pattern>" etc. did not
quite work, which has been corrected.

* ra/rev-parse-exclude-glob:
  refs: fix some exclude patterns being ignored
  refs: show --exclude failure with --branches/tags/remotes=glob
This commit is contained in:
Junio C Hamano 2018-11-18 18:23:56 +09:00
commit c72431ffc9
2 changed files with 61 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
refs.c
View File

@ -217,6 +217,7 @@ char *resolve_refdup(const char *refname, int resolve_flags,
/* The argument to filter_refs */ /* The argument to filter_refs */
struct ref_filter { struct ref_filter {
const char *pattern; const char *pattern;
const char *prefix;
each_ref_fn *fn; each_ref_fn *fn;
void *cb_data; 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)) if (wildmatch(filter->pattern, refname, 0))
return 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.fn = fn;
filter.cb_data = cb_data; filter.cb_data = cb_data;
ret = for_each_ref(filter_refs, &filter); ret = for_each_ref(filter_refs, &filter);

60
t/t6018-rev-list-glob.sh
View File

@ -36,7 +36,13 @@ test_expect_success 'setup' '
git tag foo/bar master && git tag foo/bar master &&
commit master3 && commit master3 &&
git update-ref refs/remotes/foo/baz master && git update-ref refs/remotes/foo/baz master &&
commit master4 commit master4 &&
git update-ref refs/remotes/upstream/one subspace/one &&
git update-ref refs/remotes/upstream/two subspace/two &&
git update-ref refs/remotes/upstream/x subspace-x &&
git tag qux/one subspace/one &&
git tag qux/two subspace/two &&
git tag qux/x subspace-x
' '
test_expect_success 'rev-parse --glob=refs/heads/subspace/*' ' test_expect_success 'rev-parse --glob=refs/heads/subspace/*' '
@ -153,6 +159,54 @@ test_expect_success 'rev-parse --all clears --exclude' '
compare rev-parse "--exclude=* --all --all" "--all" compare rev-parse "--exclude=* --all --all" "--all"
' '
test_expect_success 'rev-parse --exclude=glob with --branches=glob' '
compare rev-parse "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
'
test_expect_success 'rev-parse --exclude=glob with --tags=glob' '
compare rev-parse "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
'
test_expect_success 'rev-parse --exclude=glob with --remotes=glob' '
compare rev-parse "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
'
test_expect_success 'rev-parse --exclude=ref with --branches=glob' '
compare rev-parse "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
'
test_expect_success 'rev-parse --exclude=ref with --tags=glob' '
compare rev-parse "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
'
test_expect_success 'rev-parse --exclude=ref with --remotes=glob' '
compare rev-parse "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
'
test_expect_success 'rev-list --exclude=glob with --branches=glob' '
compare rev-list "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
'
test_expect_success 'rev-list --exclude=glob with --tags=glob' '
compare rev-list "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
'
test_expect_success 'rev-list --exclude=glob with --remotes=glob' '
compare rev-list "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
'
test_expect_success 'rev-list --exclude=ref with --branches=glob' '
compare rev-list "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
'
test_expect_success 'rev-list --exclude=ref with --tags=glob' '
compare rev-list "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
'
test_expect_success 'rev-list --exclude=ref with --remotes=glob' '
compare rev-list "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
'
test_expect_success 'rev-list --glob=refs/heads/subspace/*' ' test_expect_success 'rev-list --glob=refs/heads/subspace/*' '
compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/*" compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
@ -245,7 +299,7 @@ test_expect_success 'rev-list --tags=foo' '
test_expect_success 'rev-list --tags' ' test_expect_success 'rev-list --tags' '
compare rev-list "foo/bar" "--tags" compare rev-list "foo/bar qux/x qux/two qux/one" "--tags"
' '
@ -304,7 +358,7 @@ test_expect_success 'shortlog accepts --glob/--tags/--remotes' '
"master other/three someref subspace-x subspace/one subspace/two" \ "master other/three someref subspace-x subspace/one subspace/two" \
"--glob=heads/*" && "--glob=heads/*" &&
compare shortlog foo/bar --tags=foo && compare shortlog foo/bar --tags=foo &&
compare shortlog foo/bar --tags && compare shortlog "foo/bar qux/one qux/two qux/x" --tags &&
compare shortlog foo/baz --remotes=foo compare shortlog foo/baz --remotes=foo
' '