From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Thu, 4 Aug 2011 04:36:22 +0000 (+0200)
Subject: Remove redundant check
X-Git-Tag: v1.7.7-rc0~23^2~17
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7373eab48e284a808cde766831172d3447f9e320;p=git-core%2Fgit.git

Remove redundant check

bootstrap_attr_stack() also checks whether attr_stack is already set.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/attr.c b/attr.c
index b8ce1586c..ab30c81b4 100644
--- a/attr.c
+++ b/attr.c
@@ -565,8 +565,7 @@ static void prepare_attr_stack(const char *path)
 	 * .gitattributes in deeper directories to shallower ones,
 	 * and finally use the built-in set as the default.
 	 */
-	if (!attr_stack)
-		bootstrap_attr_stack();
+	bootstrap_attr_stack();
 
 	/*
 	 * Pop the "info" one that is always at the top of the stack.