Add per-repo option to use more conservative approach for git pull #469

New Issue

2025-10-31T15:12:53-05:00

GiteaMirror commented

2025-10-31 15:12:53 -05:00

Originally created by @oblivioncth on GitHub (Jul 12, 2025).

Although ultimately the users responsibility, in a similar vein to #458 it would be cool if a toggle could be added to repositories that when enabled will cause komodo to use the following strategy when a git pull is needed (instead of the current reset --hard approach):

git stash
Change to the correct branch if not already
Fetch/pull upstream changes
If the branch is the same as before, git stash pop

If there are merge conflicts or other issues, then simply fail the actions with an error so the user knows they need to clean-up their local repo.

Alternatively

Check if repo is the correct one, if not fail
git stash if working changes
Fetch/pull upstream
git stash pop if stash present
If merge conflicts, fail

Essentially, just expect the repo to be a state Komodo can use, and if any point a problem arises simply fail with an error instead of trying to force the repo back into a useable state.

Would help prevent the loss of WIP changes to some stacks if Komodo was being used for that purpose.

Low priority issue of course.

Originally created by @oblivioncth on GitHub (Jul 12, 2025). Although ultimately the users responsibility, in a similar vein to #458 it would be cool if a toggle could be added to repositories that when enabled will cause komodo to use the following strategy when a `git pull` is needed (instead of the current `reset --hard` approach): 1) `git stash` 2) Change to the correct branch if not already 3) Fetch/pull upstream changes 4) If the branch is the same as before, `git stash pop` If there are merge conflicts or other issues, then simply fail the actions with an error so the user knows they need to clean-up their local repo. Alternatively 1) Check if repo is the correct one, if not fail 2) `git stash` if working changes 3) Fetch/pull upstream 4) `git stash pop` if stash present 5) If merge conflicts, fail Essentially, just expect the repo to be a state Komodo can use, and if any point a problem arises simply fail with an error instead of trying to force the repo back into a useable state. Would help prevent the loss of WIP changes to some stacks if Komodo was being used for that purpose. Low priority issue of course.

GiteaMirror added the enhancement label 2025-10-31 15:12:53 -05:00

Add per-repo option to use more conservative approach for git pull #469

Add per-repo option to use more conservative approach for `git pull` #469