]> git.droids-corp.org - git-central.git/log
git-central.git
16 years agoUse a config variable for where sendmail is at.
Stephen Haberman [Tue, 11 Nov 2008 21:35:24 +0000 (15:35 -0600)]
Use a config variable for where sendmail is at.

16 years agoLet merges pass the client-side trac hook as they can already pass on the server...
Stephen Haberman [Tue, 11 Nov 2008 20:30:59 +0000 (14:30 -0600)]
Let merges pass the client-side trac hook as they can already pass on the server side.

16 years agoUse dirname instead of an POST_RECEIVE_TRAC environment variable.
Stephen Haberman [Tue, 11 Nov 2008 20:13:25 +0000 (14:13 -0600)]
Use dirname instead of an POST_RECEIVE_TRAC environment variable.

16 years agoNew branches should not get the update your local branch message.
Stephen Haberman [Mon, 3 Nov 2008 21:23:35 +0000 (15:23 -0600)]
New branches should not get the update your local branch message.

16 years agoExternalize hudson address to HUDSON_URL environment variable.
Stephen Haberman [Tue, 21 Oct 2008 21:39:10 +0000 (16:39 -0500)]
Externalize hudson address to HUDSON_URL environment variable.

16 years agoUpdate comments.
Stephen Haberman [Tue, 21 Oct 2008 21:35:57 +0000 (16:35 -0500)]
Update comments.

16 years agoRemove debug output.
Stephen Haberman [Tue, 21 Oct 2008 21:32:36 +0000 (16:32 -0500)]
Remove debug output.

16 years agoAdd hooks.post-receive-hudson.ignored to skip making Hudson projects.
Stephen Haberman [Tue, 21 Oct 2008 21:30:42 +0000 (16:30 -0500)]
Add hooks.post-receive-hudson.ignored to skip making Hudson projects.

16 years agoRely on USER_EMAIL instead of hardcoding payflex.com.
Stephen Haberman [Tue, 21 Oct 2008 21:17:53 +0000 (16:17 -0500)]
Rely on USER_EMAIL instead of hardcoding payflex.com.

16 years agoFirst crack at a hudson project creation script.
Stephen Haberman [Tue, 21 Oct 2008 21:16:04 +0000 (16:16 -0500)]
First crack at a hudson project creation script.

16 years agoDelay to avoid ticket changes failing.
Stephen Haberman [Fri, 17 Oct 2008 03:50:20 +0000 (22:50 -0500)]
Delay to avoid ticket changes failing.

16 years agoIt's unlikely, but warn the user to update first before telling them they need to...
Stephen Haberman [Wed, 15 Oct 2008 03:40:03 +0000 (22:40 -0500)]
It's unlikely, but warn the user to update first before telling them they need to merge.

16 years agoUse a 0.11 idioim for tracking cnum. Seems to have fixed a cnum stomp I had
Stephen Haberman [Mon, 13 Oct 2008 04:33:17 +0000 (23:33 -0500)]
Use a 0.11 idioim for tracking cnum. Seems to have fixed a cnum stomp I had
happen tonight (but have not exhaustively reproduced).

16 years agoFix spaces->tabs.
Stephen Haberman [Fri, 10 Oct 2008 17:11:24 +0000 (12:11 -0500)]
Fix spaces->tabs.

16 years agoUpgrade the client post-checkout hook to automatically reset the merge attribute...
Stephen Haberman [Fri, 3 Oct 2008 07:00:03 +0000 (02:00 -0500)]
Upgrade the client post-checkout hook to automatically reset the merge attribute for stable-cloned branches.

16 years agoRemove extra 'bin/sh' line.
Stephen Haberman [Fri, 3 Oct 2008 06:32:01 +0000 (01:32 -0500)]
Remove extra 'bin/sh' line.

16 years agoRemove wrapper scripts that did nothing. Can always put back later.
Stephen Haberman [Fri, 3 Oct 2008 06:31:23 +0000 (01:31 -0500)]
Remove wrapper scripts that did nothing. Can always put back later.

16 years agoAdd missing '&&' suffixes.
Stephen Haberman [Fri, 3 Oct 2008 06:30:35 +0000 (01:30 -0500)]
Add missing '&&' suffixes.

16 years agoStore the branch name for the lulz.
Stephen Haberman [Fri, 3 Oct 2008 06:29:42 +0000 (01:29 -0500)]
Store the branch name for the lulz.

16 years agoDrop dependency on the trac repo (and hence git plugin).
Stephen Haberman [Wed, 8 Oct 2008 21:43:24 +0000 (16:43 -0500)]
Drop dependency on the trac repo (and hence git plugin).

16 years agoLet 0-commit stable branches move on.
Stephen Haberman [Tue, 30 Sep 2008 23:30:58 +0000 (18:30 -0500)]
Let 0-commit stable branches move on.

16 years agoUse sh instead of bash.
Stephen Haberman [Tue, 30 Sep 2008 17:28:23 +0000 (12:28 -0500)]
Use sh instead of bash.

16 years agoFix update-stable for 0-commit branches.
Stephen Haberman [Tue, 30 Sep 2008 16:34:47 +0000 (11:34 -0500)]
Fix update-stable for 0-commit branches.

16 years agoAdding a functions and redoing the tattoo to use the r/X tags.
Stephen Haberman [Tue, 30 Sep 2008 03:47:38 +0000 (22:47 -0500)]
Adding a functions and redoing the tattoo to use the r/X tags.

16 years agoAdd display_error_message to reduce duplication.
Stephen Haberman [Tue, 30 Sep 2008 03:24:45 +0000 (22:24 -0500)]
Add display_error_message to reduce duplication.

16 years agoAdd a with_lock function to ensure commitnumber appends do not interweave.
Stephen Haberman [Mon, 29 Sep 2008 14:55:20 +0000 (09:55 -0500)]
Add a with_lock function to ensure commitnumber appends do not interweave.

16 years agoPass the output of git describe --tags to trac as well.
Stephen Haberman [Mon, 29 Sep 2008 09:33:54 +0000 (04:33 -0500)]
Pass the output of git describe --tags to trac as well.

16 years agoConsolidate cat+grep calls into just grep.
Stephen Haberman [Mon, 29 Sep 2008 08:45:08 +0000 (03:45 -0500)]
Consolidate cat+grep calls into just grep.

16 years agoAppend to a separate "commitnumbers" to avoid race conditions.
Stephen Haberman [Mon, 29 Sep 2008 08:36:54 +0000 (03:36 -0500)]
Append to a separate "commitnumbers" to avoid race conditions.

Also use `git tag` to create the tag instead of mucking directly with
packed-refs. The refs will end up there eventually upon gc.

16 years agoFirst pass at sequential commit numbers.
Stephen Haberman [Mon, 29 Sep 2008 08:17:14 +0000 (03:17 -0500)]
First pass at sequential commit numbers.

16 years agoRestore prefer-rebase to its previous behavior--still working on tests.
Stephen Haberman [Mon, 29 Sep 2008 07:44:40 +0000 (02:44 -0500)]
Restore prefer-rebase to its previous behavior--still working on tests.

16 years agoEcho the initial commit hash and add a better comment.
Stephen Haberman [Mon, 29 Sep 2008 07:43:31 +0000 (02:43 -0500)]
Echo the initial commit hash and add a better comment.

16 years agoTest to reproduce interactive rebasing not rebasing.
Stephen Haberman [Mon, 29 Sep 2008 07:43:08 +0000 (02:43 -0500)]
Test to reproduce interactive rebasing not rebasing.

16 years agoTest the conflict diff email.
Stephen Haberman [Sun, 28 Sep 2008 06:49:48 +0000 (01:49 -0500)]
Test the conflict diff email.

16 years agoI'm not ready to enforce that all tips must be new quite yet.
Stephen Haberman [Sat, 27 Sep 2008 04:40:23 +0000 (23:40 -0500)]
I'm not ready to enforce that all tips must be new quite yet.

16 years agoUse the new install_update_hook function.
Stephen Haberman [Sat, 27 Sep 2008 04:39:54 +0000 (23:39 -0500)]
Use the new install_update_hook function.

16 years agoFix indentation.
Stephen Haberman [Thu, 25 Sep 2008 19:47:40 +0000 (14:47 -0500)]
Fix indentation.

16 years agoFix missing tabs.
Stephen Haberman [Thu, 25 Sep 2008 06:04:02 +0000 (01:04 -0500)]
Fix missing tabs.

16 years agoMake a create-stable-branch script. Easy.
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.

16 years agoReproduce and fix with gc-pull the merge replay problem.
Stephen Haberman [Wed, 24 Sep 2008 19:13:01 +0000 (14:13 -0500)]
Reproduce and fix with gc-pull the merge replay problem.

16 years agoRe-describe each commit.
Stephen Haberman [Fri, 29 Aug 2008 16:06:06 +0000 (11:06 -0500)]
Re-describe each commit.

16 years agoWatch out for parent not existing yet.
Stephen Haberman [Fri, 29 Aug 2008 07:51:07 +0000 (02:51 -0500)]
Watch out for parent not existing yet.

16 years agoMove some comments around.
Stephen Haberman [Thu, 28 Aug 2008 16:16:50 +0000 (11:16 -0500)]
Move some comments around.

16 years agoBetter tattoo.
Stephen Haberman [Thu, 28 Aug 2008 16:03:58 +0000 (11:03 -0500)]
Better tattoo.

16 years agoDisallow creating branches that are directly (no-commit) on stable.
Stephen Haberman [Wed, 27 Aug 2008 17:13:01 +0000 (12:13 -0500)]
Disallow creating branches that are directly (no-commit) on stable.

16 years agoFix missing -r in gc-checkout looking for existing tracking branches.
Stephen Haberman [Tue, 26 Aug 2008 19:26:21 +0000 (14:26 -0500)]
Fix missing -r in gc-checkout looking for existing tracking branches.

16 years agoFlush out tattoo and tests.
Stephen Haberman [Mon, 25 Aug 2008 17:59:42 +0000 (12:59 -0500)]
Flush out tattoo and tests.

16 years agoFix tags and short_refname assignment.
Stephen Haberman [Mon, 25 Aug 2008 16:32:29 +0000 (11:32 -0500)]
Fix tags and short_refname assignment.

16 years agoStart of tattoo.
Stephen Haberman [Mon, 25 Aug 2008 16:28:50 +0000 (11:28 -0500)]
Start of tattoo.

16 years agoDon't complain if checking out something like a hash.
Stephen Haberman [Mon, 25 Aug 2008 14:45:46 +0000 (09:45 -0500)]
Don't complain if checking out something like a hash.

16 years agoWe can't use =~ in cbas1's version of bash.
Stephen Haberman [Mon, 25 Aug 2008 16:26:25 +0000 (11:26 -0500)]
We can't use =~ in cbas1's version of bash.

16 years agoProactive refollow.
Stephen Haberman [Mon, 25 Aug 2008 05:33:01 +0000 (00:33 -0500)]
Proactive refollow.

16 years agoBrief docs.
Stephen Haberman [Mon, 25 Aug 2008 02:38:35 +0000 (21:38 -0500)]
Brief docs.

16 years agoUpgrade update-stable to enforce candidate/topic as well.
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.

16 years agoDenote what ref we should match, though a symbolic name would be better.
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.

16 years agoFix test-lib bug not &&'ing together the exit code for multiple update scripts.
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.

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.