mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-27 20:14:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ignore .gitattributes in bare repositories

Browse Source 
Attributes can be specified at three different places: the internal
table of default values, the file $GIT_DIR/info/attributes and files
named .gitattributes in the work tree.  Since bare repositories don't
have a work tree, git should ignore any .gitattributes files there.

This patch makes git do that, so the only way left for a user to specify
attributes in a bare repository is the file info/attributes (in addition
to changing the defaults and recompiling).

In addition, git-check-attr is now allowed to run without a work tree.
Like any user of the code in attr.c, it ignores the .gitattributes files
when run in a bare repository.  It can still read from info/attributes.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2008-06-08 17:16:11 +02:00 committed by Junio C Hamano
parent 457bb45291
commit 2d35d556e2
3 changed files with 60 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
attr.c
View File

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

2
git.c
View File

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

35
t/t0003-attributes.sh
View File

@ -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 test_done