diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-01-28 11:13:07 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-01-28 11:13:07 -0800 |
commit | 6d7c1c88940320c2ccde9d996181826a38ff7a81 (patch) | |
tree | 9773353087b0423a17a0202fdd9e1f496fb6b8b7 | |
parent | 7025616048e2cdf61b7f5c6e4fba8045020fb537 (diff) | |
parent | 712efb1a42c8012e5d49f288bf7307e2da09d646 (diff) | |
download | git-6d7c1c88940320c2ccde9d996181826a38ff7a81.tar.gz |
Merge branch 'nd/attr-debug-fix' into maint
* nd/attr-debug-fix:
attr: make it build with DEBUG_ATTR again
-rw-r--r-- | attr.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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--; |