Merge branch 'rs/attr'

* rs/attr:
  Ignore .gitattributes in bare repositories

attr.c

@@ -438,11 +438,13 @@ static void bootstrap_attr_stack(void)
 		elem->prev = attr_stack;
 		attr_stack = elem;
 
-		elem = read_attr(GITATTRIBUTES_FILE, 1);
+		if (!is_bare_repository()) {
-		elem->origin = strdup("");
+			elem = read_attr(GITATTRIBUTES_FILE, 1);
-		elem->prev = attr_stack;
+			elem->origin = strdup("");
-		attr_stack = elem;
+			elem->prev = attr_stack;
-		debug_push(elem);
+			attr_stack = elem;
+			debug_push(elem);
+		}
 
 		elem = read_attr_from_file(git_path(INFOATTRIBUTES_FILE), 1);
 		if (!elem)
@@ -501,22 +503,24 @@ static void prepare_attr_stack(const char *path, int dirlen)
 	/*
 	 * Read from parent directories and push them down
 	 */
-	while (1) {
+	if (!is_bare_repository()) {
-		char *cp;
+		while (1) {
-
+			char *cp;
-		len = strlen(attr_stack->origin);
+
-		if (dirlen <= len)
+			len = strlen(attr_stack->origin);
-			break;
+			if (dirlen <= len)
-		memcpy(pathbuf, path, dirlen);
+				break;
-		memcpy(pathbuf + dirlen, "/", 2);
+			memcpy(pathbuf, path, dirlen);
-		cp = strchr(pathbuf + len + 1, '/');
+			memcpy(pathbuf + dirlen, "/", 2);
-		strcpy(cp + 1, GITATTRIBUTES_FILE);
+			cp = strchr(pathbuf + len + 1, '/');
-		elem = read_attr(pathbuf, 0);
+			strcpy(cp + 1, GITATTRIBUTES_FILE);
-		*cp = '\0';
+			elem = read_attr(pathbuf, 0);
-		elem->origin = strdup(pathbuf);
+			*cp = '\0';
-		elem->prev = attr_stack;
+			elem->origin = strdup(pathbuf);
-		attr_stack = elem;
+			elem->prev = attr_stack;
-		debug_push(elem);
+			attr_stack = elem;
+			debug_push(elem);
+		}
 	}
 
 	/*

git.c

@@ -286,7 +286,7 @@ static void handle_internal_command(int argc, const char **argv)
 		{ "checkout-index", cmd_checkout_index,
 			RUN_SETUP | NEED_WORK_TREE},
 		{ "check-ref-format", cmd_check_ref_format },
-		{ "check-attr", cmd_check_attr, RUN_SETUP | NEED_WORK_TREE },
+		{ "check-attr", cmd_check_attr, RUN_SETUP },
 		{ "cherry", cmd_cherry, RUN_SETUP },
 		{ "cherry-pick", cmd_cherry_pick, RUN_SETUP | NEED_WORK_TREE },
 		{ "clone", cmd_clone },

t/t0003-attributes.sh

@@ -54,4 +54,39 @@ test_expect_success 'root subdir attribute test' '
 
 '
 
+test_expect_success 'setup bare' '
+
+	git clone --bare . bare.git &&
+	cd bare.git
+
+'
+
+test_expect_success 'bare repository: check that .gitattribute is ignored' '
+
+	(
+		echo "f	test=f"
+		echo "a/i test=a/i"
+	) >.gitattributes &&
+	attr_check f unspecified &&
+	attr_check a/f unspecified &&
+	attr_check a/c/f unspecified &&
+	attr_check a/i unspecified &&
+	attr_check subdir/a/i unspecified
+
+'
+
+test_expect_success 'bare repository: test info/attributes' '
+
+	(
+		echo "f	test=f"
+		echo "a/i test=a/i"
+	) >info/attributes &&
+	attr_check f f &&
+	attr_check a/f f &&
+	attr_check a/c/f f &&
+	attr_check a/i a/i &&
+	attr_check subdir/a/i unspecified
+
+'
+
 test_done