mirror of
https://github.com/kossakovsky/n8n-install.git
synced 2026-04-29 02:59:59 +00:00
refactor(update): replace git pull with fetch + reset for reliable sync
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:
@@ -18,6 +18,9 @@ set -e
|
||||
source "$(dirname "$0")/utils.sh"
|
||||
init_paths
|
||||
|
||||
# Source git utilities
|
||||
source "$SCRIPT_DIR/git.sh"
|
||||
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
# System Update
|
||||
@@ -39,8 +42,7 @@ apt install -y \
|
||||
apt-transport-https python3-dotenv python3-yaml
|
||||
|
||||
# Configure git to use rebase on pull (prevents merge commits during updates)
|
||||
log_info "Configuring git pull strategy..."
|
||||
git config --global pull.rebase true
|
||||
git_configure_pull_rebase
|
||||
|
||||
# Configuring Firewall (UFW)
|
||||
log_subheader "Firewall (UFW)"
|
||||
|
||||
Reference in New Issue
Block a user