Mailinglist Archive: opensuse-buildservice (256 mails)

< Previous Next >
[opensuse-buildservice] [PATCH 1/3] [obs-service-tar_scm] Checkout master before git update
Check out master branch before doing git update so that merge succeeds
and the files are updated.
---
tar_scm | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/tar_scm b/tar_scm
index 257b794..34b50f9 100644
--- a/tar_scm
+++ b/tar_scm
@@ -175,6 +175,8 @@ elif [ "$MYSCM" == "git" ]; then
# update existing content for speed/bandwidth reasons
cd "$TAR_DIRECTORY"
OLDVERSION=`git show --pretty=%at | head -n 1`
+ # switch to default branch so that merge succeeds
+ git checkout master || exit 1
git pull $MYGITARGS || exit 1
if [ -n "$MYREVISION" ]; then
git checkout "$MYREVISION" || exit 1
--
1.7.3.4

--
To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-buildservice+help@xxxxxxxxxxxx

< Previous Next >
Follow Ups
References