diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-15 01:05:59 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-15 01:06:00 +0400 |
| commit | 28b68216de080405f8eb1030982b8b1e79ffd6f0 (patch) | |
| tree | b52d56653c3faf99ceb19c58e9121ff74347f996 /builtin/check-attr.c | |
| parent | 384364b5f1aa0c3b7610a1b3c9eca2c210e61b41 (diff) | |
| parent | cdbf623254fc281e42eb41e700ae785813983960 (diff) | |
Merge branch 'jc/check-attr-honor-working-tree'
"git check-attr" when (trying to) work on a repository with a
working tree did not work well when the working tree was specified
via --work-tree (and obviously with --git-dir).
The command also works in a bare repository but it reads from the
(possibly stale, irrelevant and/or nonexistent) index, which may
need to be fixed to read from HEAD, but that is a completely
separate issue. As a related tangent to this separate issue, we
may want to also fix "check-ignore", which refuses to work in a
bare repository, to also operate in a bare one.
* jc/check-attr-honor-working-tree:
check-attr: move to the top of working tree when in non-bare repository
t0003: do not chdir the whole test process
Diffstat (limited to 'builtin/check-attr.c')
| -rw-r--r-- | builtin/check-attr.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/check-attr.c b/builtin/check-attr.c index e9af7b2bfb9..5600ec3f616 100644 --- a/builtin/check-attr.c +++ b/builtin/check-attr.c @@ -102,6 +102,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, |