From: Henrik Grubbström <grubba@grubba.org>
Date: Tue, 6 Apr 2010 12:46:42 +0000 (+0200)
Subject: attr: Fixed debug output for macro expansion.
X-Git-Tag: v1.7.2-rc0~149^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=426c27b7c0a415cec451d8fd369ecd5a86adf85e;p=git.git

attr: Fixed debug output for macro expansion.

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 <grubba@grubba.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/attr.c b/attr.c
index f5346ed32..7dc17b950 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--;
 		}