summaryrefslogtreecommitdiff
path: root/attr.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-28 11:13:07 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-28 11:13:07 -0800
commit6d7c1c88940320c2ccde9d996181826a38ff7a81 (patch)
tree9773353087b0423a17a0202fdd9e1f496fb6b8b7 /attr.c
parent7025616048e2cdf61b7f5c6e4fba8045020fb537 (diff)
parent712efb1a42c8012e5d49f288bf7307e2da09d646 (diff)
downloadgit-6d7c1c88940320c2ccde9d996181826a38ff7a81.tar.gz
Merge branch 'nd/attr-debug-fix' into maint
* nd/attr-debug-fix: attr: make it build with DEBUG_ATTR again
Diffstat (limited to 'attr.c')
-rw-r--r--attr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/attr.c b/attr.c
index 466c93fa50..b05110d586 100644
--- a/attr.c
+++ b/attr.c
@@ -704,7 +704,7 @@ static int fill_one(const char *what, struct match_attr *a, int rem)
if (*n == ATTR__UNKNOWN) {
debug_set(what,
- a->is_macro ? a->u.attr->name : a->u.pattern,
+ a->is_macro ? a->u.attr->name : a->u.pat.pattern,
attr, v);
*n = v;
rem--;