[Qa-jenkins-scm] [jenkins.debian.net] 01/01: torbrowser tests: commit local changes temporarily to please gbp

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 24cb7610be894718c55f2e57ab3489846146969c
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Jan 6 18:16:07 2016 +0100

    torbrowser tests: commit local changes temporarily to please gbp
---
 bin/test_torbrowser-launcher.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index 69ef2d8..57f058e 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git