From e9f9f37e8611e97c7683b3ab257f6c07b16862d4 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 6 Jun 2012 13:35:31 +0200 Subject: [PATCH] script/commit_mark.sh: add the current branch name This will be useful once we have autobuild for a v4-0-test branch and want to cherry-pick commits from master metze Autobuild-User(master-autobuild): Stefan Metzmacher Autobuild-Date(master-autobuild): Mi 6. Jun 13:42:53 CEST 2012 on SERNOX11 Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Thu Jun 7 01:18:55 CEST 2012 on sn-devel-104 --- script/commit_mark.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/script/commit_mark.sh b/script/commit_mark.sh index 8495808cc64..e9e0f122b81 100755 --- a/script/commit_mark.sh +++ b/script/commit_mark.sh @@ -1,8 +1,10 @@ #!/bin/sh # add a autobuild message to the HEAD commit -if grep -q '^Autobuild.User' "$1"; then - echo "Already marked as tested" +branch=$(git branch --contains HEAD | grep '^\* ' | sed -e 's/^\* //') + +if grep -q "^Autobuild\-User($branch): " "$1"; then + echo "Already marked as tested for $branch" exit 0 fi @@ -13,7 +15,7 @@ if test -z "$mailaddr" ; then fi cat <> "$1" -Autobuild-User: $fullname <$mailaddr> -Autobuild-Date: $(date) on $(hostname) +Autobuild-User($branch): $fullname <$mailaddr> +Autobuild-Date($branch): $(date) on $(hostname) EOF exit 0 -- 2.11.4.GIT