summaryrefslogtreecommitdiff
path: root/attr.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-18 19:20:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-01-18 19:20:12 (GMT)
commit3a39fa750d891c72c96f4652fc6a85e2e1f17da7 (patch)
tree0733aeffaaa3eeed47854e79b7ef5643b11a406e /attr.c
parent3ab4c543e30c2c57dd79ea1cb15cb3a6f18cc614 (diff)
parent712efb1a42c8012e5d49f288bf7307e2da09d646 (diff)
downloadgit-3a39fa750d891c72c96f4652fc6a85e2e1f17da7.zip
git-3a39fa750d891c72c96f4652fc6a85e2e1f17da7.tar.gz
git-3a39fa750d891c72c96f4652fc6a85e2e1f17da7.tar.bz2
Merge branch 'nd/attr-debug-fix'
Fix debugging support that was broken in earlier change. * 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 d6d7190..2335399 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--;