]> git.droids-corp.org - git-central.git/log
git-central.git
16 years agoTypo.
Stephen Haberman [Sun, 24 Aug 2008 18:43:05 +0000 (13:43 -0500)]
Typo.

16 years agoDon't let in tags that are not within a branch.
Stephen Haberman [Sun, 24 Aug 2008 17:46:26 +0000 (12:46 -0500)]
Don't let in tags that are not within a branch.

16 years agoTry and flush out all the commands devs would need.
Stephen Haberman [Sun, 24 Aug 2008 03:58:30 +0000 (22:58 -0500)]
Try and flush out all the commands devs would need.

I'm not sure I like this, but it is worth a try.

16 years agoFetch before looking for remote branches.
Stephen Haberman [Sun, 24 Aug 2008 03:46:05 +0000 (22:46 -0500)]
Fetch before looking for remote branches.

16 years agoUse rev-parse so gc-checkout recognizes more than just branch names.
Stephen Haberman [Sun, 24 Aug 2008 03:43:46 +0000 (22:43 -0500)]
Use rev-parse so gc-checkout recognizes more than just branch names.

16 years agoTrying a gc prefix.
Stephen Haberman [Sun, 24 Aug 2008 03:32:24 +0000 (22:32 -0500)]
Trying a gc prefix.

16 years agoFix link.
Stephen Haberman [Sat, 23 Aug 2008 05:54:03 +0000 (00:54 -0500)]
Fix link.

16 years agoTry passing in git describe too.
Stephen Haberman [Sat, 23 Aug 2008 05:45:33 +0000 (00:45 -0500)]
Try passing in git describe too.

16 years agoInclude the refname in the trac comment.
Stephen Haberman [Sat, 23 Aug 2008 02:58:55 +0000 (21:58 -0500)]
Include the refname in the trac comment.

16 years agoHaven't really been using these.
Stephen Haberman [Fri, 22 Aug 2008 19:34:01 +0000 (14:34 -0500)]
Haven't really been using these.

16 years agocbas stuff is in the cbas.git repo now.
Stephen Haberman [Fri, 22 Aug 2008 19:33:36 +0000 (14:33 -0500)]
cbas stuff is in the cbas.git repo now.

16 years agoRefactor to do diff per commit and only show conflicted changes in merges.
Stephen Haberman [Fri, 22 Aug 2008 12:28:06 +0000 (07:28 -0500)]
Refactor to do diff per commit and only show conflicted changes in merges.

16 years agoRemove newlines.
Stephen Haberman [Thu, 21 Aug 2008 19:57:17 +0000 (14:57 -0500)]
Remove newlines.

16 years agoI never really liked the footer.
Stephen Haberman [Thu, 21 Aug 2008 19:50:37 +0000 (14:50 -0500)]
I never really liked the footer.

16 years agoRefactoring.
Stephen Haberman [Thu, 21 Aug 2008 19:43:42 +0000 (14:43 -0500)]
Refactoring.

16 years agoDon't go into merges.
Stephen Haberman [Thu, 21 Aug 2008 18:58:57 +0000 (13:58 -0500)]
Don't go into merges.

For the commit list anyway--diff is still in the works.

16 years agoTest how merges with and without conflicts are currently rendered.
Stephen Haberman [Thu, 21 Aug 2008 06:19:33 +0000 (01:19 -0500)]
Test how merges with and without conflicts are currently rendered.

16 years agoMove to scripts--still a work in progress.
Stephen Haberman [Thu, 21 Aug 2008 05:51:07 +0000 (00:51 -0500)]
Move to scripts--still a work in progress.

16 years agoKnown bad.
Stephen Haberman [Thu, 21 Aug 2008 05:39:56 +0000 (00:39 -0500)]
Known bad.

16 years agoTest rewind and rewind and continue even though we don't allow them.
Stephen Haberman [Thu, 21 Aug 2008 05:18:32 +0000 (00:18 -0500)]
Test rewind and rewind and continue even though we don't allow them.

The email script should have full coverage now--refactoring can commence.

16 years agoTest update/delete annotated tags as well.
Stephen Haberman [Thu, 21 Aug 2008 04:46:17 +0000 (23:46 -0500)]
Test update/delete annotated tags as well.

16 years agoTest update/delete lightweight tags.
Stephen Haberman [Thu, 21 Aug 2008 04:22:43 +0000 (23:22 -0500)]
Test update/delete lightweight tags.

16 years agoTest making a lightweight tag.
Stephen Haberman [Thu, 21 Aug 2008 03:57:03 +0000 (22:57 -0500)]
Test making a lightweight tag.

16 years agoHandle double posting when multiple branches are pointing to the same commit.
Stephen Haberman [Wed, 20 Aug 2008 22:52:48 +0000 (17:52 -0500)]
Handle double posting when multiple branches are pointing to the same commit.

16 years agoWe can check hooks into gitconfig as well.
Stephen Haberman [Tue, 19 Aug 2008 22:00:50 +0000 (17:00 -0500)]
We can check hooks into gitconfig as well.

16 years agoDrop the sh extension.
Stephen Haberman [Tue, 19 Aug 2008 20:44:37 +0000 (15:44 -0500)]
Drop the sh extension.

16 years ago'add' picks up all changes.
Stephen Haberman [Tue, 19 Aug 2008 20:41:37 +0000 (15:41 -0500)]
'add' picks up all changes.

16 years agoRefactor create-branch into checkout which does more.
Stephen Haberman [Tue, 19 Aug 2008 20:34:43 +0000 (15:34 -0500)]
Refactor create-branch into checkout which does more.

16 years agoTest for pull doing rebase.
Stephen Haberman [Tue, 19 Aug 2008 20:18:16 +0000 (15:18 -0500)]
Test for pull doing rebase.

16 years agoPush/pull scripts.
Stephen Haberman [Thu, 14 Aug 2008 22:50:34 +0000 (17:50 -0500)]
Push/pull scripts.

16 years agocreate-branch script.
Stephen Haberman [Thu, 14 Aug 2008 22:14:03 +0000 (17:14 -0500)]
create-branch script.

16 years agoWe use a locally installed version of the conf now.
Stephen Haberman [Thu, 14 Aug 2008 18:10:20 +0000 (13:10 -0500)]
We use a locally installed version of the conf now.

16 years agoMove allow settings into a subsection.
Stephen Haberman [Thu, 14 Aug 2008 17:54:09 +0000 (12:54 -0500)]
Move allow settings into a subsection.

16 years agoMove post-receive-email settings to a subsection.
Stephen Haberman [Thu, 14 Aug 2008 17:48:36 +0000 (12:48 -0500)]
Move post-receive-email settings to a subsection.

16 years agoConvert git config over to a post receive script.
Stephen Haberman [Thu, 14 Aug 2008 16:21:58 +0000 (11:21 -0500)]
Convert git config over to a post receive script.

16 years agoDon't use fancy regex stuff that isn't in bash 3.0.
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.

16 years agoAdd excused to ensure follows.
Stephen Haberman [Thu, 14 Aug 2008 15:51:30 +0000 (10:51 -0500)]
Add excused to ensure follows.

16 years agoAllow branches to be excused from the ticket check.
Stephen Haberman [Thu, 14 Aug 2008 15:33:11 +0000 (10:33 -0500)]
Allow branches to be excused from the ticket check.

16 years agoRename update-trac -> update-ensure-ticket-reference.
Stephen Haberman [Thu, 14 Aug 2008 04:15:44 +0000 (23:15 -0500)]
Rename update-trac -> update-ensure-ticket-reference.

16 years agoAdd comment.
Stephen Haberman [Thu, 14 Aug 2008 04:12:15 +0000 (23:12 -0500)]
Add comment.

16 years agoConvert lock check over to using config properties.
Stephen Haberman [Thu, 14 Aug 2008 04:03:13 +0000 (23:03 -0500)]
Convert lock check over to using config properties.

16 years agoScripts/hooks to store settings in a separate 'gitconfig' branch.
Stephen Haberman [Thu, 14 Aug 2008 03:19:02 +0000 (22:19 -0500)]
Scripts/hooks to store settings in a separate 'gitconfig' branch.

16 years agoAllow tags to lag stable.
Stephen Haberman [Wed, 13 Aug 2008 17:54:28 +0000 (12:54 -0500)]
Allow tags to lag stable.

16 years agoLocked update.
Stephen Haberman [Wed, 13 Aug 2008 17:40:47 +0000 (12:40 -0500)]
Locked update.

16 years agoInclude update-ensure-follows in the cbas hooks.
Stephen Haberman [Wed, 13 Aug 2008 17:22:11 +0000 (12:22 -0500)]
Include update-ensure-follows in the cbas hooks.

16 years agoupdate-ensure-follows to force stable tracking.
Stephen Haberman [Wed, 13 Aug 2008 17:19:29 +0000 (12:19 -0500)]
update-ensure-follows to force stable tracking.

16 years agoHandle multiple base revisions--now with the code.
Stephen Haberman [Thu, 24 Jul 2008 06:13:23 +0000 (01:13 -0500)]
Handle multiple base revisions--now with the code.

16 years agoHandle multiple base revisions between the parents we're examining.
Stephen Haberman [Thu, 24 Jul 2008 06:11:37 +0000 (01:11 -0500)]
Handle multiple base revisions between the parents we're examining.

16 years agoRemove debug output.
Stephen Haberman [Wed, 23 Jul 2008 23:02:12 +0000 (18:02 -0500)]
Remove debug output.

16 years agoDon't let merge commits fool the prefer-rebase script.
Stephen Haberman [Wed, 23 Jul 2008 22:36:09 +0000 (17:36 -0500)]
Don't let merge commits fool the prefer-rebase script.

16 years agoAdd support for locking branches.
Stephen Haberman [Wed, 23 Jul 2008 13:20:55 +0000 (08:20 -0500)]
Add support for locking branches.

16 years agoUse the logged in user. Hardcode '@payflex.com' for now.
Stephen Haberman [Sat, 19 Jul 2008 04:58:47 +0000 (23:58 -0500)]
Use the logged in user. Hardcode '@payflex.com' for now.

16 years agoHook to keep out camel casing.
Stephen Haberman [Mon, 14 Jul 2008 01:24:03 +0000 (20:24 -0500)]
Hook to keep out camel casing.

16 years agoUse permanent shims as the test hook scripts. Not used by all the tests yet.
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.

16 years agoKeeping update-prefer-rebase from stepping on update-stable.
Stephen Haberman [Sun, 13 Jul 2008 20:48:53 +0000 (15:48 -0500)]
Keeping update-prefer-rebase from stepping on update-stable.

16 years agoFollow along with GitNotes.
Stephen Haberman [Thu, 10 Jul 2008 18:02:12 +0000 (13:02 -0500)]
Follow along with GitNotes.

16 years agoReverse the order so the trac comments match the commits in chronological order.
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.

16 years agoInstall the stable hook sooner to see it work for the initial stable commit.
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.

16 years agoRewrite of stable protection with the 'no-ff' strategy.
Stephen Haberman [Wed, 9 Jul 2008 08:28:21 +0000 (03:28 -0500)]
Rewrite of stable protection with the 'no-ff' strategy.

16 years agoEnsure merged work.
Stephen Haberman [Mon, 7 Jul 2008 22:38:47 +0000 (17:38 -0500)]
Ensure merged work.

16 years agoUsing a user-specific conf that wasn't owned by the SSH user wasn't working out.
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.

16 years agoBetter error message.
Stephen Haberman [Mon, 7 Jul 2008 22:36:27 +0000 (17:36 -0500)]
Better error message.

16 years agoOnly put in the username instead of the name+email.
Stephen Haberman [Mon, 7 Jul 2008 22:36:02 +0000 (17:36 -0500)]
Only put in the username instead of the name+email.

16 years agoConvert stable to update.
Stephen Haberman [Tue, 24 Jun 2008 17:47:30 +0000 (12:47 -0500)]
Convert stable to update.

16 years agoConvert trac to update instead of pre-receive.
Stephen Haberman [Tue, 24 Jun 2008 17:30:12 +0000 (12:30 -0500)]
Convert trac to update instead of pre-receive.

16 years agoupdate-no-rewind -> update-allow-tags-branches.
Stephen Haberman [Tue, 24 Jun 2008 17:22:29 +0000 (12:22 -0500)]
update-no-rewind -> update-allow-tags-branches.

16 years agoAnother comment.
Stephen Haberman [Tue, 24 Jun 2008 17:18:16 +0000 (12:18 -0500)]
Another comment.

16 years agoPutting the comments back.
Stephen Haberman [Tue, 24 Jun 2008 17:15:58 +0000 (12:15 -0500)]
Putting the comments back.

16 years agoConvert prefer-rebase to update.
Stephen Haberman [Tue, 24 Jun 2008 17:14:22 +0000 (12:14 -0500)]
Convert prefer-rebase to update.

16 years agoActually commit the email tweaks this time.
Stephen Haberman [Tue, 24 Jun 2008 14:11:00 +0000 (09:11 -0500)]
Actually commit the email tweaks this time.

16 years agoTweak the email format.
Stephen Haberman [Tue, 24 Jun 2008 08:38:54 +0000 (03:38 -0500)]
Tweak the email format.

16 years agoMore email tests.
Stephen Haberman [Tue, 24 Jun 2008 08:26:54 +0000 (03:26 -0500)]
More email tests.

16 years agoA simpler, more robust approach to prefer rebase.
Stephen Haberman [Tue, 24 Jun 2008 06:10:16 +0000 (01:10 -0500)]
A simpler, more robust approach to prefer rebase.

16 years agoAdding comments.
Stephen Haberman [Tue, 24 Jun 2008 04:45:02 +0000 (23:45 -0500)]
Adding comments.

16 years agoTest the fixes for the shims.
Stephen Haberman [Tue, 24 Jun 2008 04:31:24 +0000 (23:31 -0500)]
Test the fixes for the shims.

16 years agoFix variable name stomp.
Stephen Haberman [Mon, 23 Jun 2008 20:39:37 +0000 (15:39 -0500)]
Fix variable name stomp.

16 years agoThe -p/-r went away.
Stephen Haberman [Mon, 23 Jun 2008 20:39:04 +0000 (15:39 -0500)]
The -p/-r went away.

16 years agoHandline new lines correctly.
Stephen Haberman [Mon, 23 Jun 2008 20:37:41 +0000 (15:37 -0500)]
Handline new lines correctly.

16 years agoFix suppressing the exit value.
Stephen Haberman [Mon, 23 Jun 2008 20:36:54 +0000 (15:36 -0500)]
Fix suppressing the exit value.

16 years agoCopy in update-no-rewind, make executable.
Stephen Haberman [Sun, 22 Jun 2008 20:23:42 +0000 (15:23 -0500)]
Copy in update-no-rewind, make executable.

16 years agoHave cbas enforce only one and prefer rebase.
Stephen Haberman [Sun, 22 Jun 2008 20:06:11 +0000 (15:06 -0500)]
Have cbas enforce only one and prefer rebase.

16 years agoDumb shell script installer for our client hooks.
Stephen Haberman [Sun, 22 Jun 2008 20:14:17 +0000 (15:14 -0500)]
Dumb shell script installer for our client hooks.

16 years agoActual file for post-checkout-rebase.
Stephen Haberman [Sun, 22 Jun 2008 20:13:50 +0000 (15:13 -0500)]
Actual file for post-checkout-rebase.

16 years agoSet rebase on checkout.
Stephen Haberman [Sun, 22 Jun 2008 19:39:50 +0000 (14:39 -0500)]
Set rebase on checkout.

16 years agoMove to the server directory.
Stephen Haberman [Sun, 22 Jun 2008 00:39:31 +0000 (19:39 -0500)]
Move to the server directory.

16 years agoCleaning up.
Stephen Haberman [Sun, 22 Jun 2008 00:38:32 +0000 (19:38 -0500)]
Cleaning up.

16 years agoRemoving for now.
Stephen Haberman [Sat, 21 Jun 2008 22:09:26 +0000 (17:09 -0500)]
Removing for now.

16 years agoOnly one branch push/recive.
Stephen Haberman [Sat, 21 Jun 2008 16:19:29 +0000 (11:19 -0500)]
Only one branch push/recive.

16 years agoPrefer rebase. Nice.
Stephen Haberman [Fri, 20 Jun 2008 18:29:39 +0000 (13:29 -0500)]
Prefer rebase. Nice.

16 years agoFirst test for emails.
Stephen Haberman [Fri, 20 Jun 2008 17:04:48 +0000 (12:04 -0500)]
First test for emails.

16 years agoHardcode the '/srv/git/hooks' directory for now.
Stephen Haberman [Fri, 20 Jun 2008 14:58:27 +0000 (09:58 -0500)]
Hardcode the '/srv/git/hooks' directory for now.

16 years ago-ticket > -trac.
Stephen Haberman [Fri, 20 Jun 2008 14:55:45 +0000 (09:55 -0500)]
-ticket > -trac.

16 years agoShow pre-receive-stable stopping following commands if used via a shim.
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.

16 years agoAdd pre-receive-stable to protect stable from non-qa'd commits.
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.

16 years agoRemove extra newline.
Stephen Haberman [Fri, 20 Jun 2008 05:14:18 +0000 (00:14 -0500)]
Remove extra newline.

16 years agoDon't enforce log messages for merge commitss.
Stephen Haberman [Fri, 20 Jun 2008 04:51:44 +0000 (23:51 -0500)]
Don't enforce log messages for merge commitss.

16 years agoThe commit-msg misses merges somehow. Which I guess is good for this hook.
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.

16 years agoTest cleanup.
Stephen Haberman [Fri, 20 Jun 2008 04:42:40 +0000 (23:42 -0500)]
Test cleanup.

16 years agoRename 'client' commit-msg.
Stephen Haberman [Fri, 20 Jun 2008 04:42:13 +0000 (23:42 -0500)]
Rename 'client' commit-msg.

16 years agoTest ranges of tickets.
Stephen Haberman [Fri, 20 Jun 2008 04:00:00 +0000 (23:00 -0500)]
Test ranges of tickets.