the-distro/infra
9
0
Fork 5
Code Issues 39 Pull requests 8 Packages Projects 1 Releases Wiki Activity

gerrit-one-way-sync: merge instead of rebase

Browse source
This commit is contained in:
Yureka 2024-07-19 23:13:20 +02:00
parent 03b53234d3
commit 0ff5eea4ed
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/gerrit/one-way-sync.nix
View file

@ -31,8 +31,8 @@ let
git pull origin ${fromRefspec} git pull origin ${fromRefspec}
EXPECTED_REF=$(git rev-list ${localRefspec} | head -1) EXPECTED_REF=$(git rev-list ${localRefspec} | head -1)
git fetch ${fromUri} ${fromRefspec} git fetch ${fromUri} ${fromRefspec}
git rebase FETCH_HEAD git merge FETCH_HEAD
GIT_SSH_COMMAND='ssh -i ${cfg.deployKeyPath}' git push ${cfg.pushUrl} HEAD:${targetRef} --force-with-lease=${targetRef}:$EXPECTED_REF --force-if-includes GIT_SSH_COMMAND='ssh -i ${cfg.deployKeyPath}' git push ${cfg.pushUrl} HEAD:${targetRef}
''; '';
serviceConfig = { serviceConfig = {
User = "git"; User = "git";