diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-18 14:03:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-18 14:03:03 -0700 |
| commit | a8b31316ef90153f148b685a802195885d5195f4 (patch) | |
| tree | bd98cb4fb6c37f604b5d137669e8a5787632fdbb /builtin | |
| parent | 6d011b8e3f36fc5b41d2451f488067ee367d7084 (diff) | |
| parent | cdbf623254fc281e42eb41e700ae785813983960 (diff) | |
| download | git-a8b31316ef90153f148b685a802195885d5195f4.tar.gz git-a8b31316ef90153f148b685a802195885d5195f4.tar.xz | |
Merge branch 'jc/check-attr-honor-working-tree' into maint
"git check-attr" when working on a repository with a working tree
did not work well when the working tree was specified via the
--work-tree (and obviously with --git-dir) option.
* 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')
| -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 e9af7b2bf..5600ec3f6 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, |