[SCM] Samba Shared Repository - branch master updated

Stefan Metzmacher metze at samba.org
Wed Jun 6 17:19:04 MDT 2012


The branch, master has been updated
       via  e9f9f37 script/commit_mark.sh: add the current branch name
      from  1c01cb4 s3:include: change lock_struct->fnum to uint64_t

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e9f9f37e8611e97c7683b3ab257f6c07b16862d4
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Jun 6 13:35:31 2012 +0200

    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 at samba.org>
    Autobuild-Date(master-autobuild): Mi 6. Jun 13:42:53 CEST 2012 on SERNOX11
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Thu Jun  7 01:18:55 CEST 2012 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 script/commit_mark.sh |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/script/commit_mark.sh b/script/commit_mark.sh
index 8495808..e9e0f12 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


-- 
Samba Shared Repository


More information about the samba-cvs mailing list