diff --git a/services/gerrit/one-way-sync.nix b/services/gerrit/one-way-sync.nix index c8248c5..250b59f 100644 --- a/services/gerrit/one-way-sync.nix +++ b/services/gerrit/one-way-sync.nix @@ -29,7 +29,7 @@ let echo "Current ref: $EXPECTED_REF" git worktree add -f "$RUNTIME_DIRECTORY"/${name} refs/remotes/origin/${localRefspec} cd "$RUNTIME_DIRECTORY"/${name} - git pull origin ${localRefspec} + git pull origin ${localRefspec} --no-rebase EXPECTED_REF=$(git rev-list refs/remotes/origin/${localRefspec} | head -1) git config user.name Fork-o-Tron git config user.email noreply@forkos.org