From 5dbcccfa0384c68400feb80cbaf4a86b129de2cb Mon Sep 17 00:00:00 2001 From: "robert.tomczyk" Date: Tue, 17 Sep 2019 16:11:38 +0100 Subject: [PATCH] ONAP: Ignore git normalization changes on checkout When the .gitatribute file is setup to change the file line-ending in the repository the file will be updated straight after git checkout. The -f flag will ignore those normalized files which cause the rebuild job to fail for some ONAP projects. Change-Id: I34007888815956fd04809d693c5fee0df1017c8a --- jjb/onap/rebase-jobs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jjb/onap/rebase-jobs.sh b/jjb/onap/rebase-jobs.sh index e888d43e..d8a98229 100755 --- a/jjb/onap/rebase-jobs.sh +++ b/jjb/onap/rebase-jobs.sh @@ -32,7 +32,7 @@ git remote -v echo "-- Merging changes from ONAP remote branches to local branch: --" for branch in ${REMOTE_BRANCHES} ; do echo "------ Branch name: ${branch}" - git checkout ${branch} -q + git checkout ${branch} -q -f git merge origin/${branch} --ff-only --stat done echo "-- Pushing changes to Nordix Gerrit --" -- 2.25.1