From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Jan 2013 17:34:28 +0000 (-0800)
Subject: Merge branch 'nd/fix-directory-attrs-off-by-one'
X-Git-Tag: v1.8.2-rc0~100
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9a9f243f6426056058c7c29999c27a086f94e035?ds=inline;hp=-c

Merge branch 'nd/fix-directory-attrs-off-by-one'

Fix performance regression introduced by an earlier change to let
attributes apply to directories.

Needs to be merged to maint, as 94bc671a was merged there already.

* nd/fix-directory-attrs-off-by-one:
attr: avoid calling find_basename() twice per path
attr: fix off-by-one directory component length calculation
---

9a9f243f6426056058c7c29999c27a086f94e035
diff --combined attr.c
index 233539969a,ab2aab28de..4657cc233c
--- a/attr.c
+++ b/attr.c
@@@ -284,7 -284,7 +284,7 @@@ static struct match_attr *parse_attr_li
   * (reading the file from top to bottom), .gitattribute of the root
   * directory (again, reading the file from top to bottom) down to the
   * current directory, and then scan the list backwards to find the first match.
 - * This is exactly the same as what excluded() does in dir.c to deal with
 + * This is exactly the same as what is_excluded() does in dir.c to deal with
   * .gitignore
   */
  
@@@ -564,25 -564,12 +564,12 @@@ static void bootstrap_attr_stack(void
  	attr_stack = elem;
  }
  
- static const char *find_basename(const char *path)
- {
- 	const char *cp, *last_slash = NULL;
- 
- 	for (cp = path; *cp; cp++) {
- 		if (*cp == '/' && cp[1])
- 			last_slash = cp;
- 	}
- 	return last_slash ? last_slash + 1 : path;
- }
- 
- static void prepare_attr_stack(const char *path)
+ static void prepare_attr_stack(const char *path, int dirlen)
  {
  	struct attr_stack *elem, *info;
- 	int dirlen, len;
+ 	int len;
  	const char *cp;
  
- 	dirlen = find_basename(path) - path;
- 
  	/*
  	 * At the bottom of the attribute stack is the built-in
  	 * set of attribute definitions, followed by the contents
@@@ -704,7 -691,7 +691,7 @@@ static int fill_one(const char *what, s
  
  		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--;
@@@ -762,15 -749,26 +749,26 @@@ static int macroexpand_one(int attr_nr
  static void collect_all_attrs(const char *path)
  {
  	struct attr_stack *stk;
- 	int i, pathlen, rem;
- 	const char *basename;
+ 	int i, pathlen, rem, dirlen;
+ 	const char *basename, *cp, *last_slash = NULL;
+ 
+ 	for (cp = path; *cp; cp++) {
+ 		if (*cp == '/' && cp[1])
+ 			last_slash = cp;
+ 	}
+ 	pathlen = cp - path;
+ 	if (last_slash) {
+ 		basename = last_slash + 1;
+ 		dirlen = last_slash - path;
+ 	} else {
+ 		basename = path;
+ 		dirlen = 0;
+ 	}
  
- 	prepare_attr_stack(path);
+ 	prepare_attr_stack(path, dirlen);
  	for (i = 0; i < attr_nr; i++)
  		check_all_attr[i].value = ATTR__UNKNOWN;
  
- 	basename = find_basename(path);
- 	pathlen = strlen(path);
  	rem = attr_nr;
  	for (stk = attr_stack; 0 < rem && stk; stk = stk->prev)
  		rem = fill(path, pathlen, basename, stk, rem);