]>
git.droids-corp.org - git-central.git/log
summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Stephen Haberman [Tue, 19 Aug 2008 20:41:37 +0000 (15:41 -0500)]
'add' picks up all changes.
Stephen Haberman [Tue, 19 Aug 2008 20:34:43 +0000 (15:34 -0500)]
Refactor create-branch into checkout which does more.
Stephen Haberman [Tue, 19 Aug 2008 20:18:16 +0000 (15:18 -0500)]
Test for pull doing rebase.
Stephen Haberman [Thu, 14 Aug 2008 22:50:34 +0000 (17:50 -0500)]
Push/pull scripts.
Stephen Haberman [Thu, 14 Aug 2008 22:14:03 +0000 (17:14 -0500)]
create-branch script.
Stephen Haberman [Thu, 14 Aug 2008 18:10:20 +0000 (13:10 -0500)]
We use a locally installed version of the conf now.
Stephen Haberman [Thu, 14 Aug 2008 17:54:09 +0000 (12:54 -0500)]
Move allow settings into a subsection.
Stephen Haberman [Thu, 14 Aug 2008 17:48:36 +0000 (12:48 -0500)]
Move post-receive-email settings to a subsection.
Stephen Haberman [Thu, 14 Aug 2008 16:21:58 +0000 (11:21 -0500)]
Convert git config over to a post receive script.
Stephen Haberman [Thu, 14 Aug 2008 16:17:44 +0000 (11:17 -0500)]
Don't use fancy regex stuff that isn't in bash 3.0.
Stephen Haberman [Thu, 14 Aug 2008 15:51:30 +0000 (10:51 -0500)]
Add excused to ensure follows.
Stephen Haberman [Thu, 14 Aug 2008 15:33:11 +0000 (10:33 -0500)]
Allow branches to be excused from the ticket check.
Stephen Haberman [Thu, 14 Aug 2008 04:15:44 +0000 (23:15 -0500)]
Rename update-trac -> update-ensure-ticket-reference.
Stephen Haberman [Thu, 14 Aug 2008 04:12:15 +0000 (23:12 -0500)]
Add comment.
Stephen Haberman [Thu, 14 Aug 2008 04:03:13 +0000 (23:03 -0500)]
Convert lock check over to using config properties.
Stephen Haberman [Thu, 14 Aug 2008 03:19:02 +0000 (22:19 -0500)]
Scripts/hooks to store settings in a separate 'gitconfig' branch.
Stephen Haberman [Wed, 13 Aug 2008 17:54:28 +0000 (12:54 -0500)]
Allow tags to lag stable.
Stephen Haberman [Wed, 13 Aug 2008 17:40:47 +0000 (12:40 -0500)]
Locked update.
Stephen Haberman [Wed, 13 Aug 2008 17:22:11 +0000 (12:22 -0500)]
Include update-ensure-follows in the cbas hooks.
Stephen Haberman [Wed, 13 Aug 2008 17:19:29 +0000 (12:19 -0500)]
update-ensure-follows to force stable tracking.
Stephen Haberman [Thu, 24 Jul 2008 06:13:23 +0000 (01:13 -0500)]
Handle multiple base revisions--now with the code.
Stephen Haberman [Thu, 24 Jul 2008 06:11:37 +0000 (01:11 -0500)]
Handle multiple base revisions between the parents we're examining.
Stephen Haberman [Wed, 23 Jul 2008 23:02:12 +0000 (18:02 -0500)]
Remove debug output.
Stephen Haberman [Wed, 23 Jul 2008 22:36:09 +0000 (17:36 -0500)]
Don't let merge commits fool the prefer-rebase script.
Stephen Haberman [Wed, 23 Jul 2008 13:20:55 +0000 (08:20 -0500)]
Add support for locking branches.
Stephen Haberman [Sat, 19 Jul 2008 04:58:47 +0000 (23:58 -0500)]
Use the logged in user. Hardcode '@payflex.com' for now.
Stephen Haberman [Mon, 14 Jul 2008 01:24:03 +0000 (20:24 -0500)]
Hook to keep out camel casing.
Stephen Haberman [Sun, 13 Jul 2008 21:49:31 +0000 (16:49 -0500)]
Use permanent shims as the test hook scripts. Not used by all the tests yet.
Stephen Haberman [Sun, 13 Jul 2008 20:48:53 +0000 (15:48 -0500)]
Keeping update-prefer-rebase from stepping on update-stable.
Stephen Haberman [Thu, 10 Jul 2008 18:02:12 +0000 (13:02 -0500)]
Follow along with GitNotes.
Stephen Haberman [Thu, 10 Jul 2008 03:00:50 +0000 (22:00 -0500)]
Reverse the order so the trac comments match the commits in chronological order.
Stephen Haberman [Wed, 9 Jul 2008 08:41:08 +0000 (03:41 -0500)]
Install the stable hook sooner to see it work for the initial stable commit.
Stephen Haberman [Wed, 9 Jul 2008 08:28:21 +0000 (03:28 -0500)]
Rewrite of stable protection with the 'no-ff' strategy.
Stephen Haberman [Mon, 7 Jul 2008 22:38:47 +0000 (17:38 -0500)]
Ensure merged work.
Stephen Haberman [Mon, 7 Jul 2008 22:37:37 +0000 (17:37 -0500)]
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.
Stephen Haberman [Mon, 7 Jul 2008 22:36:27 +0000 (17:36 -0500)]
Better error message.
Stephen Haberman [Mon, 7 Jul 2008 22:36:02 +0000 (17:36 -0500)]
Only put in the username instead of the name+email.
Stephen Haberman [Tue, 24 Jun 2008 17:47:30 +0000 (12:47 -0500)]
Convert stable to update.
Stephen Haberman [Tue, 24 Jun 2008 17:30:12 +0000 (12:30 -0500)]
Convert trac to update instead of pre-receive.
Stephen Haberman [Tue, 24 Jun 2008 17:22:29 +0000 (12:22 -0500)]
update-no-rewind -> update-allow-tags-branches.
Stephen Haberman [Tue, 24 Jun 2008 17:18:16 +0000 (12:18 -0500)]
Another comment.
Stephen Haberman [Tue, 24 Jun 2008 17:15:58 +0000 (12:15 -0500)]
Putting the comments back.
Stephen Haberman [Tue, 24 Jun 2008 17:14:22 +0000 (12:14 -0500)]
Convert prefer-rebase to update.
Stephen Haberman [Tue, 24 Jun 2008 14:11:00 +0000 (09:11 -0500)]
Actually commit the email tweaks this time.
Stephen Haberman [Tue, 24 Jun 2008 08:38:54 +0000 (03:38 -0500)]
Tweak the email format.
Stephen Haberman [Tue, 24 Jun 2008 08:26:54 +0000 (03:26 -0500)]
More email tests.
Stephen Haberman [Tue, 24 Jun 2008 06:10:16 +0000 (01:10 -0500)]
A simpler, more robust approach to prefer rebase.
Stephen Haberman [Tue, 24 Jun 2008 04:45:02 +0000 (23:45 -0500)]
Adding comments.
Stephen Haberman [Tue, 24 Jun 2008 04:31:24 +0000 (23:31 -0500)]
Test the fixes for the shims.
Stephen Haberman [Mon, 23 Jun 2008 20:39:37 +0000 (15:39 -0500)]
Fix variable name stomp.
Stephen Haberman [Mon, 23 Jun 2008 20:39:04 +0000 (15:39 -0500)]
The -p/-r went away.
Stephen Haberman [Mon, 23 Jun 2008 20:37:41 +0000 (15:37 -0500)]
Handline new lines correctly.
Stephen Haberman [Mon, 23 Jun 2008 20:36:54 +0000 (15:36 -0500)]
Fix suppressing the exit value.
Stephen Haberman [Sun, 22 Jun 2008 20:23:42 +0000 (15:23 -0500)]
Copy in update-no-rewind, make executable.
Stephen Haberman [Sun, 22 Jun 2008 20:06:11 +0000 (15:06 -0500)]
Have cbas enforce only one and prefer rebase.
Stephen Haberman [Sun, 22 Jun 2008 20:14:17 +0000 (15:14 -0500)]
Dumb shell script installer for our client hooks.
Stephen Haberman [Sun, 22 Jun 2008 20:13:50 +0000 (15:13 -0500)]
Actual file for post-checkout-rebase.
Stephen Haberman [Sun, 22 Jun 2008 19:39:50 +0000 (14:39 -0500)]
Set rebase on checkout.
Stephen Haberman [Sun, 22 Jun 2008 00:39:31 +0000 (19:39 -0500)]
Move to the server directory.
Stephen Haberman [Sun, 22 Jun 2008 00:38:32 +0000 (19:38 -0500)]
Cleaning up.
Stephen Haberman [Sat, 21 Jun 2008 22:09:26 +0000 (17:09 -0500)]
Removing for now.
Stephen Haberman [Sat, 21 Jun 2008 16:19:29 +0000 (11:19 -0500)]
Only one branch push/recive.
Stephen Haberman [Fri, 20 Jun 2008 18:29:39 +0000 (13:29 -0500)]
Prefer rebase. Nice.
Stephen Haberman [Fri, 20 Jun 2008 17:04:48 +0000 (12:04 -0500)]
First test for emails.
Stephen Haberman [Fri, 20 Jun 2008 14:58:27 +0000 (09:58 -0500)]
Hardcode the '/srv/git/hooks' directory for now.
Stephen Haberman [Fri, 20 Jun 2008 14:55:45 +0000 (09:55 -0500)]
-ticket > -trac.
Stephen Haberman [Fri, 20 Jun 2008 14:48:44 +0000 (09:48 -0500)]
Show pre-receive-stable stopping following commands if used via a shim.
Stephen Haberman [Fri, 20 Jun 2008 06:08:37 +0000 (01:08 -0500)]
Add pre-receive-stable to protect stable from non-qa'd commits.
Stephen Haberman [Fri, 20 Jun 2008 05:14:18 +0000 (00:14 -0500)]
Remove extra newline.
Stephen Haberman [Fri, 20 Jun 2008 04:51:44 +0000 (23:51 -0500)]
Don't enforce log messages for merge commitss.
Stephen Haberman [Fri, 20 Jun 2008 04:43:02 +0000 (23:43 -0500)]
The commit-msg misses merges somehow. Which I guess is good for this hook.
Stephen Haberman [Fri, 20 Jun 2008 04:42:40 +0000 (23:42 -0500)]
Test cleanup.
Stephen Haberman [Fri, 20 Jun 2008 04:42:13 +0000 (23:42 -0500)]
Rename 'client' commit-msg.
Stephen Haberman [Fri, 20 Jun 2008 04:00:00 +0000 (23:00 -0500)]
Test ranges of tickets.
Stephen Haberman [Fri, 20 Jun 2008 03:48:02 +0000 (22:48 -0500)]
Test new branches--can't use rev-parse yet as the ref doesn't exist.
Stephen Haberman [Fri, 20 Jun 2008 01:39:41 +0000 (20:39 -0500)]
Test branch creation--turns out we still need to only log new commits to avoid validating everything back to the rev 0.
Stephen Haberman [Fri, 20 Jun 2008 01:32:21 +0000 (20:32 -0500)]
Take out the extra space when going to a file.
Stephen Haberman [Fri, 20 Jun 2008 01:31:29 +0000 (20:31 -0500)]
Test the re being on the second line.
Stephen Haberman [Fri, 20 Jun 2008 01:29:58 +0000 (20:29 -0500)]
Test using the pre-receive -> pre-receive-ticket shim.
Stephen Haberman [Fri, 20 Jun 2008 01:21:29 +0000 (20:21 -0500)]
Server side (non-trac) commit message enforcement.
Stephen Haberman [Fri, 20 Jun 2008 00:28:31 +0000 (19:28 -0500)]
Let in no ticket as well.
Stephen Haberman [Fri, 20 Jun 2008 00:24:49 +0000 (19:24 -0500)]
Borrow the git test harness to test the commit message.
Stephen Haberman [Fri, 20 Jun 2008 00:24:34 +0000 (19:24 -0500)]
Add -i so we are case insensitive.
Stephen Haberman [Thu, 19 Jun 2008 22:54:14 +0000 (17:54 -0500)]
Naive client-side ticket check.
Stephen Haberman [Thu, 19 Jun 2008 22:48:59 +0000 (17:48 -0500)]
Move the trac hook around to parallelize with post-receive-email.
Stephen Haberman [Thu, 19 Jun 2008 18:07:23 +0000 (13:07 -0500)]
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
}
Stephen Haberman [Thu, 19 Jun 2008 18:01:44 +0000 (13:01 -0500)]
Original script from git contrib.
Stephen Haberman [Thu, 19 Jun 2008 18:00:40 +0000 (13:00 -0500)]
We don't need the msmtp.log.
Stephen Haberman [Thu, 19 Jun 2008 22:19:39 +0000 (17:19 -0500)]
Set to 'Initial QA' instead of 'QA'.
Stephen Haberman [Thu, 19 Jun 2008 17:47:02 +0000 (12:47 -0500)]
Initial hooks.