From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 28 Jan 2013 19:13:07 +0000 (-0800)
Subject: Merge branch 'nd/attr-debug-fix' into maint
X-Git-Tag: v1.8.1.2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6d7c1c88940320c2ccde9d996181826a38ff7a81?hp=7025616048e2cdf61b7f5c6e4fba8045020fb537

Merge branch 'nd/attr-debug-fix' into maint

* nd/attr-debug-fix:
attr: make it build with DEBUG_ATTR again
---

diff --git a/attr.c b/attr.c
index 466c93fa50..b05110d586 100644
--- 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.pattern,
 				  attr, v);
 			*n = v;
 			rem--;