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/t3400-rebase.sh | |
| parent | 8586f98bd29bd4ad3d0e62a3be4a4d59ff8b27cd (diff) | |
| download | git-1f553918a8482ea792e8cd4d5d2c75fe60f68aae.tar.gz | |
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/t3400-rebase.sh')
| -rwxr-xr-x | t/t3400-rebase.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index be7ae5a004..6e391a3702 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -83,9 +83,9 @@ test_expect_success 'rebase a single mode change' ' git checkout -b modechange HEAD^ && echo 1 > X && git add X && - chmod a+x A && + test_chmod +x A && test_tick && - git commit -m modechange A X && + git commit -m modechange && GIT_TRACE=1 git rebase master ' |