CHANGELOG.md

 # Gitaly changelog
 
+## 17.8.1 (2025-01-22)
+
+No changes.
+
 ## 17.8.0 (2025-01-15)
 
 No changes.
 
+## 17.7.3 (2025-01-22)
+
+No changes.
+
 ## 17.7.2 (2025-01-14)
 
 No changes.
@@ -22,6 +30,10 @@ No changes.
 
 - [gitaly: Query available archived WAL entries in recovery status](gitlab-org/gitaly@a8b11d9ce0a46d5d3a170bca355d665b373f1f9e) ([merge request](gitlab-org/gitaly!7404))
 
+## 17.6.4 (2025-01-22)
+
+No changes.
+
 ## 17.6.3 (2025-01-08)
 
 No changes.

internal/git/gittest/version.go

@@ -11,6 +11,18 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/testhelper"
 )
 
+// IsGitVersionLessThan checks if the Git version in use is less than then specified version.
+func IsGitVersionLessThan(tb testing.TB, ctx context.Context, cfg config.Cfg, version git.Version) bool {
+	cmdFactory, clean, err := gitcmd.NewExecCommandFactory(cfg, testhelper.SharedLogger(tb))
+	require.NoError(tb, err)
+	defer clean()
+
+	actual, err := cmdFactory.GitVersion(ctx)
+	require.NoError(tb, err)
+
+	return actual.LessThan(version)
+}
+
 // SkipIfGitVersionLessThan skips the test if the Git version in use is less than
 // expected. The reason is printed out when skipping the test
 func SkipIfGitVersionLessThan(tb testing.TB, ctx context.Context, cfg config.Cfg, expected git.Version, reason string) {

internal/gitaly/service/repository/config_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/featureflag"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/git"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/structerr"
@@ -85,7 +85,7 @@ func TestGetConfig(t *testing.T) {
 
 		// In Git 2.48.0, the order of config entries after repository initialization is different.
 		// The config "extension" entries are now listed before "core" entries.
-		if featureflag.GitV248.IsDisabled(ctx) {
+		if gittest.IsGitVersionLessThan(t, ctx, cfg, git.NewVersion(2, 48, 0, 0)) {
 			expectedConfig = gittest.ObjectHashDependent(t, map[string]string{
 				"sha1": fmt.Sprintf(
 					"[core]\n\trepositoryformatversion = %d\n\tfilemode = true\n\tbare = true\n%s%s",