summaryrefslogtreecommitdiff
path: root/builtin/check-attr.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-02-06 18:19:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-02-06 18:19:33 (GMT)
commitcdbf623254fc281e42eb41e700ae785813983960 (patch)
tree69535971c908b9cfa124f15bf427d28ee293f1f9 /builtin/check-attr.c
parentc4a7bce1b5d1ad18482a87cb80a6bddabb925f62 (diff)
downloadgit-cdbf623254fc281e42eb41e700ae785813983960.zip
git-cdbf623254fc281e42eb41e700ae785813983960.tar.gz
git-cdbf623254fc281e42eb41e700ae785813983960.tar.bz2
check-attr: move to the top of working tree when in non-bare repository
Lasse Makholm noticed that running "git check-attr" from a place totally unrelated to $GIT_DIR and $GIT_WORK_TREE does not give expected results. I think it is because the command does not say it wants to call setup_work_tree(). We still need to support use cases where only a bare repository is involved, so unconditionally requiring a working tree would not work well. Instead, make a call only in a non-bare repository. We may want to see if we want to do a similar fix in the opposite direction to check-ignore. The command unconditionally requires a working tree, but it should be usable in a bare repository just like check-attr attempts to be. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/check-attr.c')
-rw-r--r--builtin/check-attr.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/check-attr.c b/builtin/check-attr.c
index 075d01d..f29d6c3 100644
--- a/builtin/check-attr.c
+++ b/builtin/check-attr.c
@@ -94,6 +94,9 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)
struct git_attr_check *check;
int cnt, i, doubledash, filei;
+ if (!is_bare_repository())
+ setup_work_tree();
+
git_config(git_default_config, NULL);
argc = parse_options(argc, argv, prefix, check_attr_options,