]>
git.droids-corp.org - git-central.git/log
Stephen Haberman [Thu, 25 Sep 2008 19:47:40 +0000 (14:47 -0500)]
Fix indentation.
Stephen Haberman [Thu, 25 Sep 2008 06:04:02 +0000 (01:04 -0500)]
Fix missing tabs.
Stephen Haberman [Thu, 25 Sep 2008 05:57:48 +0000 (00:57 -0500)]
Make a create-stable-branch script. Easy.
Makes me wonder why all git repos don't just start with this empty directory
commit instead of the having people do the "you can't clone empty repositories
so make a dummy crap" dance.
Oh, well, I suppose it does encode my timestamp/user info/etc. Which probably
shouldn't be in every new repo git ever created. Okay, fair enough.
Stephen Haberman [Wed, 24 Sep 2008 19:13:01 +0000 (14:13 -0500)]
Reproduce and fix with gc-pull the merge replay problem.
Stephen Haberman [Fri, 29 Aug 2008 16:06:06 +0000 (11:06 -0500)]
Re-describe each commit.
Stephen Haberman [Fri, 29 Aug 2008 07:51:07 +0000 (02:51 -0500)]
Watch out for parent not existing yet.
Stephen Haberman [Thu, 28 Aug 2008 16:16:50 +0000 (11:16 -0500)]
Move some comments around.
Stephen Haberman [Thu, 28 Aug 2008 16:03:58 +0000 (11:03 -0500)]
Better tattoo.
Stephen Haberman [Wed, 27 Aug 2008 17:13:01 +0000 (12:13 -0500)]
Disallow creating branches that are directly (no-commit) on stable.
Stephen Haberman [Tue, 26 Aug 2008 19:26:21 +0000 (14:26 -0500)]
Fix missing -r in gc-checkout looking for existing tracking branches.
Stephen Haberman [Mon, 25 Aug 2008 17:59:42 +0000 (12:59 -0500)]
Flush out tattoo and tests.
Stephen Haberman [Mon, 25 Aug 2008 16:32:29 +0000 (11:32 -0500)]
Fix tags and short_refname assignment.
Stephen Haberman [Mon, 25 Aug 2008 16:28:50 +0000 (11:28 -0500)]
Start of tattoo.
Stephen Haberman [Mon, 25 Aug 2008 14:45:46 +0000 (09:45 -0500)]
Don't complain if checking out something like a hash.
Stephen Haberman [Mon, 25 Aug 2008 16:26:25 +0000 (11:26 -0500)]
We can't use =~ in cbas1's version of bash.
Stephen Haberman [Mon, 25 Aug 2008 05:33:01 +0000 (00:33 -0500)]
Proactive refollow.
Stephen Haberman [Mon, 25 Aug 2008 02:38:35 +0000 (21:38 -0500)]
Brief docs.
Stephen Haberman [Sun, 24 Aug 2008 21:31:11 +0000 (16:31 -0500)]
Upgrade update-stable to enforce candidate/topic as well.
For now we're still doing the topic is locked upon candidate
creation. I'd still prefer remerging.
Stephen Haberman [Sun, 24 Aug 2008 21:08:15 +0000 (16:08 -0500)]
Denote what ref we should match, though a symbolic name would be better.
Stephen Haberman [Sun, 24 Aug 2008 20:58:11 +0000 (15:58 -0500)]
Fix test-lib bug not &&'ing together the exit code for multiple update scripts.
Stephen Haberman [Sun, 24 Aug 2008 18:43:05 +0000 (13:43 -0500)]
Typo.
Stephen Haberman [Sun, 24 Aug 2008 17:46:26 +0000 (12:46 -0500)]
Don't let in tags that are not within a branch.
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.
Stephen Haberman [Sun, 24 Aug 2008 03:46:05 +0000 (22:46 -0500)]
Fetch before looking for remote branches.
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.
Stephen Haberman [Sun, 24 Aug 2008 03:32:24 +0000 (22:32 -0500)]
Trying a gc prefix.
Stephen Haberman [Sat, 23 Aug 2008 05:54:03 +0000 (00:54 -0500)]
Fix link.
Stephen Haberman [Sat, 23 Aug 2008 05:45:33 +0000 (00:45 -0500)]
Try passing in git describe too.
Stephen Haberman [Sat, 23 Aug 2008 02:58:55 +0000 (21:58 -0500)]
Include the refname in the trac comment.
Stephen Haberman [Fri, 22 Aug 2008 19:34:01 +0000 (14:34 -0500)]
Haven't really been using these.
Stephen Haberman [Fri, 22 Aug 2008 19:33:36 +0000 (14:33 -0500)]
cbas stuff is in the cbas.git repo now.
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.
Stephen Haberman [Thu, 21 Aug 2008 19:57:17 +0000 (14:57 -0500)]
Remove newlines.
Stephen Haberman [Thu, 21 Aug 2008 19:50:37 +0000 (14:50 -0500)]
I never really liked the footer.
Stephen Haberman [Thu, 21 Aug 2008 19:43:42 +0000 (14:43 -0500)]
Refactoring.
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.
Stephen Haberman [Thu, 21 Aug 2008 06:19:33 +0000 (01:19 -0500)]
Test how merges with and without conflicts are currently rendered.
Stephen Haberman [Thu, 21 Aug 2008 05:51:07 +0000 (00:51 -0500)]
Move to scripts--still a work in progress.
Stephen Haberman [Thu, 21 Aug 2008 05:39:56 +0000 (00:39 -0500)]
Known bad.
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.
Stephen Haberman [Thu, 21 Aug 2008 04:46:17 +0000 (23:46 -0500)]
Test update/delete annotated tags as well.
Stephen Haberman [Thu, 21 Aug 2008 04:22:43 +0000 (23:22 -0500)]
Test update/delete lightweight tags.
Stephen Haberman [Thu, 21 Aug 2008 03:57:03 +0000 (22:57 -0500)]
Test making a lightweight tag.
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.
Stephen Haberman [Tue, 19 Aug 2008 22:00:50 +0000 (17:00 -0500)]
We can check hooks into gitconfig as well.
Stephen Haberman [Tue, 19 Aug 2008 20:44:37 +0000 (15:44 -0500)]
Drop the sh extension.
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.