Merge branch 'ea/blame-use-oideq'

[thirdparty/git.git] / t / t9500-gitweb-standalone-no-errors.sh

diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
index 267ddc997d028926a81562fe6fe8eab9157da819..b484e3e25020c4feb06760accd55a1bd07db63b5 100755 (executable)
--- a/t/t9500-gitweb-standalone-no-errors.sh
+++ b/t/t9500-gitweb-standalone-no-errors.sh
@@ -621,12 +621,22 @@ test_expect_success \
         git config gitweb.snapshot "zip,tgz, tbz2" &&
         gitweb_run "p=.git;a=tree"'
 
-cat >.git/config <<\EOF
-# testing noval and alternate separator
-[gitweb]
-       blame
-       snapshot = zip tgz
-EOF
+test_expect_success 'setup' '
+       version=$(git config core.repositoryformatversion) &&
+       algo=$(test_might_fail git config extensions.objectformat) &&
+       cat >.git/config <<-\EOF &&
+       # testing noval and alternate separator
+       [gitweb]
+               blame
+               snapshot = zip tgz
+       EOF
+       git config core.repositoryformatversion "$version" &&
+       if test -n "$algo"
+       then
+               git config extensions.objectformat "$algo"
+       fi
+'
+
 test_expect_success \
        'config override: tree view, features enabled in repo config (2)' \
        'gitweb_run "p=.git;a=tree"'