summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-01-06 18:16:07 +0100
committerHolger Levsen <holger@layer-acht.org>2016-01-06 18:16:07 +0100
commit24cb7610be894718c55f2e57ab3489846146969c (patch)
tree97777cfbfaeb4bb694885d134e479be6a621c60f /bin
parent36cb95648779afb86477542d9cf11ab46d17c6f4 (diff)
downloadjenkins.debian.net-24cb7610be894718c55f2e57ab3489846146969c.tar.xz
torbrowser tests: commit local changes temporarily to please gbp
Diffstat (limited to 'bin')
-rwxr-xr-xbin/test_torbrowser-launcher.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index 69ef2d86..57f058ed 100755
--- a/bin/test_torbrowser-launcher.sh
+++ b/bin/test_torbrowser-launcher.sh
@@ -404,6 +404,7 @@ merge_debian_branch() {
local COMMIT_MSG2="$COMMIT_HASH is from branch $(echo $GIT_BRANCH|cut -d '/' -f2) from $GIT_URL."
dch -R $COMMIT_MSG1
dch -v $BUILD_VERSION $COMMIT_MSG2
+ git commit -a -m "Automatically merged by jenkins."
}
prepare_git_workspace_copy() {
@@ -414,7 +415,7 @@ prepare_git_workspace_copy() {
echo
}
-revert_git_merge() {
+revert_git_changes() {
git reset --hard
git checkout -f -q $COMMIT_HASH
git branch -D $BRANCH
@@ -448,7 +449,7 @@ if [ "$2" = "git" ] ; then
COMMIT_HASH=$(git log -1 --oneline|cut -d " " -f1)
merge_debian_branch $4
prepare_git_workspace_copy
- revert_git_merge
+ revert_git_changes
else
# just use this branch
BRANCH=$3