summaryrefslogtreecommitdiff
path: root/script
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-06-06 13:35:31 +0200
committerStefan Metzmacher <metze@samba.org>2012-06-07 01:18:55 +0200
commite9f9f37e8611e97c7683b3ab257f6c07b16862d4 (patch)
tree349c603c7f83f876e364034d75fb94f241037d04 /script
parent1c01cb45101a2f0193921ba967f800bdf6bb83cb (diff)
downloadsamba-e9f9f37e8611e97c7683b3ab257f6c07b16862d4.tar.gz
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 <metze@samba.org> Autobuild-Date(master-autobuild): Mi 6. Jun 13:42:53 CEST 2012 on SERNOX11 Autobuild-User(master): Stefan Metzmacher <metze@samba.org> Autobuild-Date(master): Thu Jun 7 01:18:55 CEST 2012 on sn-devel-104
Diffstat (limited to 'script')
-rwxr-xr-xscript/commit_mark.sh10
1 files 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 <<EOF >> "$1"
-Autobuild-User: $fullname <$mailaddr>
-Autobuild-Date: $(date) on $(hostname)
+Autobuild-User($branch): $fullname <$mailaddr>
+Autobuild-Date($branch): $(date) on $(hostname)
EOF
exit 0