fixes

Author: philip-peterson

custom/conf/app.example.ini

@@ -2145,18 +2145,6 @@ ROUTER = console
 ;NOTICE_ON_SUCCESS = false
 ;SCHEDULE = @every 72h
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Resynchronize Git configurations of all repositories.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;[cron.resync_all_configs]
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;ENABLED = false
-;RUN_AT_START = false
-;NOTICE_ON_SUCCESS = false
-;SCHEDULE = @every 72h
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Reinitialize all missing Git repositories for which records exist

docker/rootless/usr/local/bin/docker-setup.sh

@@ -8,6 +8,7 @@ if [ ! -w ${HOME} ]; then echo "${HOME} is not writable"; exit 1; fi
 mkdir -p ${GITEA_CUSTOM} && chmod 0700 ${GITEA_CUSTOM}
 
 # Prepare temp folder
+mkdir -p ${GITEA_CUSTOM} && chmod 0700 ${GITEA_CUSTOM}
 mkdir -p ${GITEA_TEMP} && chmod 0700 ${GITEA_TEMP}
 if [ ! -w ${GITEA_TEMP} ]; then echo "${GITEA_TEMP} is not writable"; exit 1; fi
 
@@ -17,6 +18,8 @@ if [ ! -f ${GITEA_APP_INI} ]; then
     #Prepare config file folder
     GITEA_APP_INI_DIR=$(dirname ${GITEA_APP_INI})
     mkdir -p ${GITEA_APP_INI_DIR} && chmod 0700 ${GITEA_APP_INI_DIR}
+
+    
     if [ ! -w ${GITEA_APP_INI_DIR} ]; then echo "${GITEA_APP_INI_DIR} is not writable"; exit 1; fi
 
     # Set INSTALL_LOCK to true only if SECRET_KEY is not empty and

docs/content/doc/advanced/config-cheat-sheet.en-us.md

@@ -1011,13 +1011,6 @@ Default templates for project boards:
 - `NOTICE_ON_SUCCESS`: **false**: Set to true to switch on success notices.
 - `SCHEDULE`: **@every 72h**: Cron syntax for scheduling repository archive cleanup, e.g. `@every 1h`.
 
-#### Cron - Resynchronize Git configs of all repositories ('cron.resync_all_configs')
-
-- `ENABLED`: **false**: Enable service.
-- `RUN_AT_START`: **false**: Run tasks at start up time (if ENABLED).
-- `NOTICE_ON_SUCCESS`: **false**: Set to true to switch on success notices.
-- `SCHEDULE`: **@every 72h**: Cron syntax for scheduling repository archive cleanup, e.g. `@every 1h`.
-
 #### Cron - Reinitialize all missing Git repositories for which records exist ('cron.reinit_missing_repos')
 
 - `ENABLED`: **false**: Enable service.

modules/git/git.go

@@ -224,6 +224,29 @@ func syncGitConfig() (err error) {
 		return err
 	}
 
+	if setting.Git.Reflog.Enabled {
+		if err := configSet("core.logAllRefUpdates", "true"); err != nil {
+			return err
+		}
+		if setting.Git.Reflog.Expiration != 90 {
+			if err := configSet("gc.reflogExpire", fmt.Sprintf("%d", setting.Git.Reflog.Expiration)); err != nil {
+				return err
+			}
+		} else {
+			if err := configUnsetAll("gc.reflogExpire", ""); err != nil {
+				return err
+			}
+		}
+	} else {
+		if err := configUnsetAll("core.logAllRefUpdates", "true"); err != nil {
+			return err
+		} else {
+			if err := configUnsetAll("gc.reflogExpire", ""); err != nil {
+				return err
+			}
+		}
+	}
+
 	if CheckGitVersionAtLeast("2.10") == nil {
 		if err := configSet("receive.advertisePushOptions", "true"); err != nil {
 			return err

modules/git/repo.go

@@ -18,7 +18,6 @@ import (
 	"time"
 
 	"code.gitea.io/gitea/modules/proxy"
-	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/util"
 )
 
@@ -303,47 +302,6 @@ func GetDivergingCommits(ctx context.Context, repoPath, baseBranch, targetBranch
 	return DivergeObject{ahead, behind}, nil
 }
 
-// CreateConfig creates a git config for the repo
-func CreateConfig(repoPath string) error {
-	return createConfig(repoPath)
-}
-
-// createConfig creates a git config for the repo
-func createConfig(repoPath string) (err error) {
-	gitConfigPath := filepath.Join(repoPath, "config")
-
-	reflogEnabled := setting.Git.Reflog.Enabled
-	reflogExpirationDays := setting.Git.Reflog.Expiration
-
-	configStr := strings.TrimSpace(`
-[core]
-	repositoryformatversion = 0
-	filemode = true
-	bare = true
-	ignorecase = true
-	precomposeunicode = true
-`)
-
-	if reflogEnabled {
-		configStr += "\n	logAllRefUpdates = true"
-		if reflogExpirationDays != 90 {
-			configStr += "\n[gc]"
-			configStr += fmt.Sprintf("\n	reflogExpire = %d", reflogExpirationDays)
-		}
-	}
-
-	configStr += "\n"
-
-	if err = util.Remove(gitConfigPath); err != nil && !os.IsNotExist(err) {
-		return fmt.Errorf("unable to pre-remove config file '%s' prior to rewriting: %w ", gitConfigPath, err)
-	}
-	if err = os.WriteFile(gitConfigPath, []byte(configStr), 0o644); err != nil {
-		return fmt.Errorf("write config file '%s': %w", gitConfigPath, err)
-	}
-
-	return nil
-}
-
 // CreateBundle create bundle content to the target path
 func (repo *Repository) CreateBundle(ctx context.Context, commit string, out io.Writer) error {
 	tmp, err := os.MkdirTemp(os.TempDir(), "gitea-bundle")

modules/repository/init.go

@@ -277,8 +277,6 @@ func checkInitRepository(ctx context.Context, owner, name string) (err error) {
 	// Init git bare new repository.
 	if err = git.InitRepository(ctx, repoPath, true); err != nil {
 		return fmt.Errorf("git.InitRepository: %w", err)
-	} else if err = git.CreateConfig(repoPath); err != nil {
-		return fmt.Errorf("git.CreateConfig: %v", err)
 	} else if err = createDelegateHooks(repoPath); err != nil {
 		return fmt.Errorf("createDelegateHooks: %w", err)
 	}

options/locale/locale_en-US.ini

@@ -2543,7 +2543,6 @@ dashboard.resync_all_sshkeys.desc = (Not needed for the built-in SSH server.)
 dashboard.resync_all_sshprincipals = Update the '.ssh/authorized_principals' file with Gitea SSH principals.
 dashboard.resync_all_sshprincipals.desc = (Not needed for the built-in SSH server.)
 dashboard.resync_all_hooks = Resynchronize pre-receive, update and post-receive hooks of all repositories.
-dashboard.resync_all_configs = Resynchronize Git configuration of all repositories.
 dashboard.reinit_missing_repos = Reinitialize all missing Git repositories for which records exist
 dashboard.sync_external_users = Synchronize external user data
 dashboard.cleanup_hook_task_table = Cleanup hook_task table

services/cron/tasks_extended.go

@@ -95,16 +95,6 @@ func registerRepositoryUpdateHook() {
 	})
 }
 
-func registerRepositoryUpdateConfig() {
-	RegisterTaskFatal("resync_all_configs", &BaseConfig{
-		Enabled:    false,
-		RunAtStart: false,
-		Schedule:   "@every 72h",
-	}, func(ctx context.Context, _ *user_model.User, _ Config) error {
-		return repo_service.SyncRepositoryConfig(ctx)
-	})
-}
-
 func registerReinitMissingRepositories() {
 	RegisterTaskFatal("reinit_missing_repos", &BaseConfig{
 		Enabled:    false,
@@ -230,7 +220,6 @@ func initExtendedTasks() {
 	registerRewriteAllPublicKeys()
 	registerRewriteAllPrincipalKeys()
 	registerRepositoryUpdateHook()
-	registerRepositoryUpdateConfig()
 	registerReinitMissingRepositories()
 	registerDeleteMissingRepositories()
 	registerRemoveRandomAvatars()

services/repository/config.go

@@ -56,10 +56,6 @@
 							<td>{{.locale.Tr "admin.dashboard.resync_all_hooks"}}</td>
 							<td><button type="submit" class="ui green button" name="op" value="resync_all_hooks">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
 						</tr>
-						<tr>
-							<td>{{.locale.Tr "admin.dashboard.resync_all_configs"}}</td>
-							<td><button type="submit" class="ui green button" name="op" value="resync_all_configs">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
-						</tr>
 						<tr>
 							<td>{{.locale.Tr "admin.dashboard.reinit_missing_repos"}}</td>
 							<td><button type="submit" class="ui green button" name="op" value="reinit_missing_repos">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>