diff options
| author |  Johannes Sixt <j6t@kdbg.org> | 2009-02-28 21:12:57 +0100 |
|---|---|---|
| committer | Johannes Sixt <j6t@kdbg.org> | 2009-03-19 21:47:14 +0100 |
| commit | 1f553918a8482ea792e8cd4d5d2c75fe60f68aae (patch) | |
| tree | 1227021499212fafc4d70e2030813598f68292c0 /t/t1410-reflog.sh | |
| parent | test-lib: Simplify test counting. (diff) | |
| download | tgif-1f553918a8482ea792e8cd4d5d2c75fe60f68aae.tar.xz | |
test-lib: Introduce test_chmod and use it instead of update-index --chmod
This function replaces sequences of 'chmod +x' and 'git update-index
--chmod=+x' in the test suite, whose purpose is to help filesystems
that need core.filemode=false. Two places where only 'chmod +x' was used
we also use this new function.
The function calls 'git update-index --chmod' without checking
core.filemode (unlike some of the call sites did). We do this because the
call sites *expect* that the executable bit ends up in the index (ie. it
is not the purpose of the call sites to *test* whether git treats
'chmod +x' and 'update-index --chmod=+x' correctly). Therefore, on
filesystems with core.filemode=true the 'git update-index --chmod' is a
no-op.
The function uses --add with update-index to help one call site in
t6031-merge-recursive. It makes no difference for the other callers.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Diffstat (limited to 't/t1410-reflog.sh')
| -rwxr-xr-x | t/t1410-reflog.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh index 5b24f05573..80af6b9b7e 100755 --- a/t/t1410-reflog.sh +++ b/t/t1410-reflog.sh @@ -70,9 +70,7 @@ test_expect_success setup ' E=`git rev-parse --verify HEAD:A/B/E` && check_fsck && - chmod +x C && - ( test "`git config --bool core.filemode`" != false || - echo executable >>C ) && + test_chmod +x C && git add C && test_tick && git commit -m dragon && L=`git rev-parse --verify HEAD` && |