undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/check-attr-honor-working-tree' into maint

Browse Source 
"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
This commit is contained in:
Junio C Hamano 2014-03-18 14:03:03 -07:00
commit a8b31316ef
2 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/check-attr.c
View File

@ -102,6 +102,9 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)
struct git_attr_check *check; struct git_attr_check *check;
int cnt, i, doubledash, filei; int cnt, i, doubledash, filei;
if (!is_bare_repository())
setup_work_tree();
git_config(git_default_config, NULL); git_config(git_default_config, NULL);
argc = parse_options(argc, argv, prefix, check_attr_options, argc = parse_options(argc, argv, prefix, check_attr_options,

22
t/t0003-attributes.sh
View File

@ -243,12 +243,23 @@ EOF
test_line_count = 0 err test_line_count = 0 err
' '
test_expect_success 'using --git-dir and --work-tree' '
mkdir unreal real &&
git init real &&
echo "file test=in-real" >real/.gitattributes &&
(
cd unreal &&
attr_check file in-real "--git-dir ../real/.git --work-tree ../real"
)
'
test_expect_success 'setup bare' ' test_expect_success 'setup bare' '
git clone --bare . bare.git && git clone --bare . bare.git
cd bare.git
' '
test_expect_success 'bare repository: check that .gitattribute is ignored' ' test_expect_success 'bare repository: check that .gitattribute is ignored' '
(
cd bare.git &&
( (
echo "f test=f" echo "f test=f"
echo "a/i test=a/i" echo "a/i test=a/i"
@ -258,16 +269,22 @@ test_expect_success 'bare repository: check that .gitattribute is ignored' '
attr_check a/c/f unspecified && attr_check a/c/f unspecified &&
attr_check a/i unspecified && attr_check a/i unspecified &&
attr_check subdir/a/i unspecified attr_check subdir/a/i unspecified
)
' '
test_expect_success 'bare repository: check that --cached honors index' ' test_expect_success 'bare repository: check that --cached honors index' '
(
cd bare.git &&
GIT_INDEX_FILE=../.git/index \ GIT_INDEX_FILE=../.git/index \
git check-attr --cached --stdin --all <../stdin-all | git check-attr --cached --stdin --all <../stdin-all |
sort >actual && sort >actual &&
test_cmp ../specified-all actual test_cmp ../specified-all actual
)
' '
test_expect_success 'bare repository: test info/attributes' ' test_expect_success 'bare repository: test info/attributes' '
(
cd bare.git &&
( (
echo "f test=f" echo "f test=f"
echo "a/i test=a/i" echo "a/i test=a/i"
@ -277,6 +294,7 @@ test_expect_success 'bare repository: test info/attributes' '
attr_check a/c/f f && attr_check a/c/f f &&
attr_check a/i a/i && attr_check a/i a/i &&
attr_check subdir/a/i unspecified attr_check subdir/a/i unspecified
)
' '
test_done test_done