LLM/n8n-install
1
0
Fork 0
mirror of https://github.com/kossakovsky/n8n-install.git synced 2026-03-07 22:33:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(update): replace git pull with fetch + reset for reliable sync

Browse Source 
extract git utilities into scripts/git.sh module. this approach handles
accidental local commits that would cause rebase conflicts during updates.
This commit is contained in:
Yury Kossakovsky
2025-12-26 09:29:53 -07:00
parent 0709e3b6d3
commit 9b252a1287
7 changed files with 173 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/utils.sh
View File

@@ -749,7 +749,7 @@ backup_preserved_dirs() {
return 0
}
# Restore preserved directories after git pull
# Restore preserved directories after git reset
# Usage: restore_preserved_dirs <backup_base_path>
# Returns: 0 on success, 1 on failure
restore_preserved_dirs() {
@@ -784,7 +784,7 @@ restore_preserved_dirs() {
fi
if [ -d "$backup_base/$dir" ]; then
log_info "Restoring $dir/ after git pull..."
log_info "Restoring $dir/ after git reset..."
# Remove the git-restored version
if [ -d "$PROJECT_ROOT/$dir" ]; then