sablink/build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[bin] move git-checkout after tag check, this is much faster

Browse Source
This commit is contained in:
Fabio Erculiani
2014-01-29 15:51:27 +01:00
parent efcbf3b3ff
commit afabf4e80a
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/kernel-autobump
+20 -20
View File
@@ -63,26 +63,6 @@ start() {
return 1;
}
if ! git show-branch "${BRANCH}" > /dev/null; then
echo "Creating branch: ${BRANCH}"
git checkout -q "${PUSH_REMOTE}/${BRANCH}" -b "${BRANCH}" || {
rollback
return 1;
}
else
echo "Checking out branch: ${BRANCH}"
git checkout -q "${BRANCH}" || {
rollback
return 1;
}
fi
echo "Updating branch"
git rebase "${PUSH_REMOTE}/${BRANCH}" || {
rollback
return 1;
}
local tags=$(git tag | grep -e "v${REGEX}")
echo "Tracking tags:"
echo -e "${tags}"
@@ -107,6 +87,26 @@ start() {
return 0
fi
if ! git show-branch "${BRANCH}" > /dev/null; then
echo "Creating branch: ${BRANCH}"
git checkout -q "${PUSH_REMOTE}/${BRANCH}" -b "${BRANCH}" || {
rollback
return 1;
}
else
echo "Checking out branch: ${BRANCH}"
git checkout -q "${BRANCH}" || {
rollback
return 1;
}
fi
echo "Updating branch"
git rebase "${PUSH_REMOTE}/${BRANCH}" || {
rollback
return 1;
}
for tag in "${bumps[@]}"; do
echo "Working on tag: ${tag}"
git merge "${tag}" -m "Automatic merge of tag ${PULL_REMOTE}/${tag}" || {