opendev/system-config
Code Issues Proposed changes

Make the merge in gerrit-git-prep like gerrit.

Browse Source 
Fixes bug 981040.

Change-Id: I89960b76f1ae6e5be6b2f5fc4695f00a7c90452a
This commit is contained in:
James E. Blair 2012-06-19 15:27:02 -07:00
parent aa1c87cf33
commit 266aa44260
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/jenkins_slave/files/slave_scripts/gerrit-git-prep.sh
View File

@ -40,7 +40,10 @@ function merge_change {
REFSPEC=$2 REFSPEC=$2
git fetch https://$SITE/p/$PROJECT $REFSPEC git fetch https://$SITE/p/$PROJECT $REFSPEC
git merge FETCH_HEAD # This should be equivalent to what gerrit does if a repo is
# set to "merge commits when necessary" and "automatically resolve
# conflicts" is set to true:
git merge -s resolve FETCH_HEAD
} }
function merge_changes { function merge_changes {