diff options
author | Henrik Grubbström <grubba@grubba.org> | 2010-04-06 14:46:42 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-04-10 18:35:59 -0700 |
commit | 426c27b7c0a415cec451d8fd369ecd5a86adf85e (patch) | |
tree | 6bfc6c40ed28ab1983bb975b417f01fc105d9a62 /attr.c | |
parent | 7fb0eaa289576a1dcd7751015ba791f1bce778a9 (diff) | |
download | git-426c27b7c0a415cec451d8fd369ecd5a86adf85e.tar.gz |
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>
Diffstat (limited to 'attr.c')
-rw-r--r-- | attr.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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--; } |