Reverse the order so the trac comments match the commits in chronological order.
Install the stable hook sooner to see it work for the initial stable commit.
Rewrite of stable protection with the 'no-ff' strategy.
Ensure merged work.
Using a user-specific conf that wasn't owned by the SSH user wasn't working out.
So just use the system conf in /home/BIPFS/shaberman instead.
Better error message.
Only put in the username instead of the name+email.
Convert stable to update.
Convert trac to update instead of pre-receive.
update-no-rewind -> update-allow-tags-branches.
Another comment.
Putting the comments back.
Convert prefer-rebase to update.
Actually commit the email tweaks this time.
Tweak the email format.
More email tests.
A simpler, more robust approach to prefer rebase.
Adding comments.
Test the fixes for the shims.
Fix variable name stomp.
The -p/-r went away.
Handline new lines correctly.
Fix suppressing the exit value.
Copy in update-no-rewind, make executable.
Have cbas enforce only one and prefer rebase.
Dumb shell script installer for our client hooks.
Actual file for post-checkout-rebase.
Set rebase on checkout.
Move to the server directory.
Cleaning up.
Removing for now.
Only one branch push/recive.
Prefer rebase. Nice.
First test for emails.
Hardcode the '/srv/git/hooks' directory for now.
-ticket > -trac.
Show pre-receive-stable stopping following commands if used via a shim.
Add pre-receive-stable to protect stable from non-qa'd commits.
Remove extra newline.
Don't enforce log messages for merge commitss.
The commit-msg misses merges somehow. Which I guess is good for this hook.
Test cleanup.
Rename 'client' commit-msg.
Test ranges of tickets.
Test new branches--can't use rev-parse yet as the ref doesn't exist.
Test branch creation--turns out we still need to only log new commits to avoid validating everything back to the rev 0.
Take out the extra space when going to a file.
Test the re being on the second line.
Test using the pre-receive -> pre-receive-ticket shim.
Server side (non-trac) commit message enforcement.
Let in no ticket as well.
Borrow the git test harness to test the commit message.
Add -i so we are case insensitive.
Naive client-side ticket check.
Move the trac hook around to parallelize with post-receive-email.
Our changes to the email script.
- Branch create: reverse order of new log messages
- Branch create: add summary of changes with patch output
- Branch update: reverse order of new log messages
- Branch update: include patch output in summary of changes
- Use msmtp instead of sendmail
index
4136895..
9fa133b 100644
--- a/server/post-receive-email
+++ b/server/post-receive-email
@@ -230,8 +230,12 @@ generate_create_branch_email()
# (see generate_update_branch_email for the explanation of this
# command)
git rev-parse --not --branches | grep -v $(git rev-parse $refname) |
- git rev-list --pretty --stdin $newrev
+ git rev-list --pretty --reverse --stdin $newrev
echo $LOGEND
+
+ echo ""
+ echo "Summary of changes:"
+ git diff-tree --stat -p $newrev
}
#
@@ -391,7 +395,7 @@ generate_update_branch_email()
echo ""
echo $LOGBEGIN
git rev-parse --not --branches | grep -v $(git rev-parse $refname) |
- git rev-list --pretty --stdin $oldrev..$newrev
+ git rev-list --reverse --pretty --stdin $oldrev..$newrev
# XXX: Need a way of detecting whether git rev-list actually
# outputted anything, so that we can issue a "no new
@@ -411,7 +415,7 @@ generate_update_branch_email()
# non-fast forward updates.
echo ""
echo "Summary of changes:"
- git diff-tree --stat --summary --find-copies-harder $oldrev..$newrev
+ git diff-tree --stat -p --find-copies-harder $oldrev..$newrev
}
#
@@ -596,7 +600,8 @@ send_mail()
if [ -n "$envelopesender" ]; then
/usr/sbin/sendmail -t -f "$envelopesender"
else
- /usr/sbin/sendmail -t
+ # /usr/sbin/sendmail -t
+ /home/BIPFS/shaberman/local/bin/msmtp --file=/srv/git/hooks/msmtp.conf -t
fi
}
Original script from git contrib.
We don't need the msmtp.log.
Set to 'Initial QA' instead of 'QA'.
Initial hooks.