From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Jan 2013 19:20:11 +0000 (-0800)
Subject: Merge branch 'nd/attr-debug-fix'
X-Git-Tag: v1.8.2-rc0~117
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3a39fa750d891c72c96f4652fc6a85e2e1f17da7?hp=3ab4c543e30c2c57dd79ea1cb15cb3a6f18cc614

Merge branch 'nd/attr-debug-fix'

Fix debugging support that was broken in earlier change.

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

diff --git a/attr.c b/attr.c
index d6d71901b2..233539969a 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--;