summaryrefslogtreecommitdiff
path: root/attr.c
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2011-08-04 06:36:22 +0200
committerJunio C Hamano <gitster@pobox.com>2011-08-04 15:53:17 -0700
commit7373eab48e284a808cde766831172d3447f9e320 (patch)
treed5ed5e3c80f0354c8dc08e4ce0c46bed37624f50 /attr.c
parentcd93bffb91630d8c695e1ac59239aa75cc2ebf92 (diff)
downloadgit-7373eab48e284a808cde766831172d3447f9e320.tar.gz
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>
Diffstat (limited to 'attr.c')
-rw-r--r--attr.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/attr.c b/attr.c
index b8ce1586c8..ab30c81b41 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.