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>
Junio C Hamano committed
Feb 6, 2014 at 10:19 UTC
cdbf623254fc281e42eb41e700ae785813983960
2 files changed
+13
builtin/check-attr.c
+3
@@ -94,6 +94,9 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)
94
struct git_attr_check *check;
95
int cnt, i, doubledash, filei;
96
97
+ if (!is_bare_repository())
98
+ setup_work_tree();
99
+
100
git_config(git_default_config, NULL);
101
102
argc = parse_options(argc, argv, prefix, check_attr_options,
t/t0003-attributes.sh
+10
@@ -196,6 +196,16 @@ test_expect_success 'root subdir attribute test' '
196
attr_check subdir/a/i unspecified
197
'
198
199
+test_expect_success 'using --git-dir and --work-tree' '
200
+ mkdir unreal real &&
201
+ git init real &&
202
+ echo "file test=in-real" >real/.gitattributes &&
203
+ (
204
+ cd unreal &&
205
+ attr_check file in-real "--git-dir ../real/.git --work-tree ../real"
206
+ )
207
+'
208
+
209
test_expect_success 'setup bare' '
210
git clone --bare . bare.git
211
'