development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-12 11:32:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jk/attr-macro-fix'

Browse source 
Asking "git check-attr" about a macro (e.g. "binary") on a specific
path did not work correctly, even though "git check-attr -a" listed
such a macro correctly.  This has been corrected.

* jk/attr-macro-fix:
  attr: do not mark queried macros as unset
This commit is contained in:
Junio C Hamano 2019-02-05 14:26:16 -08:00
parent 11494daae7 7b95849be4
commit 02bf766cc5
2 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
attr.c
View file

@ -1092,7 +1092,7 @@ static void collect_some_attrs(const struct index_state *istate,
const char *path,
struct attr_check *check)
{
int i, pathlen, rem, dirlen;
int pathlen, rem, dirlen;
const char *cp, *last_slash = NULL;
int basename_offset;
@ -1113,20 +1113,6 @@ static void collect_some_attrs(const struct index_state *istate,
all_attrs_init(&g_attr_hashmap, check);
determine_macros(check->all_attrs, check->stack);
if (check->nr) {
rem = 0;
for (i = 0; i < check->nr; i++) {
int n = check->items[i].attr->attr_nr;
struct all_attrs_item *item = &check->all_attrs[n];
if (item->macro) {
item->value = ATTR__UNSET;
rem++;
}
}
if (rem == check->nr)
return;
}
rem = check->all_attrs_nr;
fill(path, pathlen, basename_offset, check->stack, check->all_attrs, rem);
}

20
t/t0003-attributes.sh
View file

@ -322,4 +322,24 @@ test_expect_success 'bare repository: test info/attributes' '
)
'
test_expect_success 'binary macro expanded by -a' '
echo "file binary" >.gitattributes &&
cat >expect <<-\EOF &&
file: binary: set
file: diff: unset
file: merge: unset
file: text: unset
EOF
git check-attr -a file >actual &&
test_cmp expect actual
'
test_expect_success 'query binary macro directly' '
echo "file binary" >.gitattributes &&
echo file: binary: set >expect &&
git check-attr binary file >actual &&
test_cmp expect actual
'
test_done