diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-01-05 20:52:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-05 20:52:50 -0800 |
| commit | 92e802c6ccb96d1b5e8561b0a136d43d82253293 (patch) | |
| tree | 9b6c265d69d1dc8bcce36c86a44674cfb010a6d7 /t/t4006-diff-mode.sh | |
| parent | 17dff84b5e745ba17a5b3ae5591d79f96b165d48 (diff) | |
| parent | c1fe2fe4fe685e0587c3949f953aab726de88994 (diff) | |
GIT 1.0.7v1.0.7
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t4006-diff-mode.sh')
| -rwxr-xr-x | t/t4006-diff-mode.sh | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh index e2a67e9633..8ad69d1115 100755 --- a/t/t4006-diff-mode.sh +++ b/t/t4006-diff-mode.sh @@ -15,11 +15,21 @@ test_expect_success \ tree=`git-write-tree` && echo $tree' -test_expect_success \ - 'chmod' \ - 'chmod +x rezrov && - git-update-index rezrov && - git-diff-index $tree >current' +if [ "$(git repo-config --get core.filemode)" = false ] +then + say 'filemode disabled on the filesystem, using update-index --chmod=+x' + test_expect_success \ + 'git-update-index --chmod=+x' \ + 'git-update-index rezrov && + git-update-index --chmod=+x rezrov && + git-diff-index $tree >current' +else + test_expect_success \ + 'chmod' \ + 'chmod +x rezrov && + git-update-index rezrov && + git-diff-index $tree >current' +fi _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" |