Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'nd/attr-debug-fix' into maint
author
Junio C Hamano
<gitster@pobox.com>
Mon, 28 Jan 2013 19:13:07 +0000
(11:13 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 28 Jan 2013 19:13:07 +0000
(11:13 -0800)
* nd/attr-debug-fix:
attr: make it build with DEBUG_ATTR again
attr.c
patch
|
blob
|
history
raw
(from parent 1:
7025616
)
diff --git
a/attr.c
b/attr.c
index 466c93fa50976dc6a1a3019bdf47accc406acc32..b05110d586c3e5b3ff685576322c85eb0b9ddbbb 100644
(file)
--- 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
.pat
tern,
attr, v);
*n = v;
rem--;