From 426c27b7c0a415cec451d8fd369ecd5a86adf85e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m?= Date: Tue, 6 Apr 2010 14:46:42 +0200 Subject: [PATCH] attr: Fixed debug output for macro expansion. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When debug_set() was called during macro expansion, it received a pointer to a struct git_attr rather than a string. Signed-off-by: Henrik Grubbström Signed-off-by: Junio C Hamano --- attr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/attr.c b/attr.c index f5346ed32a..7dc17b9505 100644 --- a/attr.c +++ b/attr.c @@ -605,7 +605,9 @@ static int fill_one(const char *what, struct match_attr *a, int rem) const char *v = a->state[i].setto; if (*n == ATTR__UNKNOWN) { - debug_set(what, a->u.pattern, attr, v); + debug_set(what, + a->is_macro ? a->u.attr->name : a->u.pattern, + attr, v); *n = v; rem--; }