git-central.git
11 years agopost-receive-delivery: add a deliver command master
Olivier Matz [Tue, 19 Feb 2013 10:05:33 +0000 (11:05 +0100)]
post-receive-delivery: add a deliver command

Signed-off-by: Olivier Matz <zer0@droids-corp.org>
11 years agopost-receive-delivery: new script to deliver branches
Olivier Matz [Mon, 18 Feb 2013 20:52:56 +0000 (21:52 +0100)]
post-receive-delivery: new script to deliver branches

Signed-off-by: Olivier Matz <zer0@droids-corp.org>
13 years agopost-receive-hudson: Default USER_EMAIL to the committer's email address.
Stephen Haberman [Thu, 14 Apr 2011 23:41:57 +0000 (18:41 -0500)]
post-receive-hudson: Default USER_EMAIL to the committer's email address.

Patch by Aaron Boxer.

13 years agoGet tests passing again.
Stephen Haberman [Thu, 14 Apr 2011 21:14:01 +0000 (16:14 -0500)]
Get tests passing again.

* Lots of /bin/sh -> bin/bash changes
* Change "server" directory in tests to be a bare repository
* Remove "lockfile" usage for a plain, always-available "mkdir"

Partially contributed and otherwise prompted by Aaron Boxer.

13 years agoTry to fix readme links again.
Stephen Haberman [Fri, 4 Feb 2011 21:33:09 +0000 (15:33 -0600)]
Try to fix readme links again.

13 years agoFix readme links.
Stephen Haberman [Fri, 4 Feb 2011 21:30:41 +0000 (15:30 -0600)]
Fix readme links.

14 years agoSet u+x on scripts.
Stephen Haberman [Fri, 2 Apr 2010 21:41:34 +0000 (16:41 -0500)]
Set u+x on scripts.

14 years agoUse bash and fix the here document.
Stephen Haberman [Fri, 2 Apr 2010 21:41:07 +0000 (16:41 -0500)]
Use bash and fix the here document.

14 years agoNotes from awhile ago.
Stephen Haberman [Sat, 1 Aug 2009 22:07:21 +0000 (17:07 -0500)]
Notes from awhile ago.

15 years agoAdd some weak docs and samples for server-side hook install.
Stephen Haberman [Tue, 23 Dec 2008 03:10:01 +0000 (21:10 -0600)]
Add some weak docs and samples for server-side hook install.

15 years agoUpdate docs.
Stephen Haberman [Wed, 10 Dec 2008 18:58:41 +0000 (12:58 -0600)]
Update docs.

15 years agoRemove candidate/topic auto-locking as it was too aggressive.
Stephen Haberman [Sat, 15 Nov 2008 04:55:10 +0000 (22:55 -0600)]
Remove candidate/topic auto-locking as it was too aggressive.

15 years agoTodo.
Stephen Haberman [Thu, 13 Nov 2008 04:39:17 +0000 (22:39 -0600)]
Todo.

15 years agoAuto-deploy files other than config and hooks.
Stephen Haberman [Thu, 13 Nov 2008 04:37:50 +0000 (22:37 -0600)]
Auto-deploy files other than config and hooks.

15 years agoFilling in docs.
Stephen Haberman [Thu, 13 Nov 2008 04:28:12 +0000 (22:28 -0600)]
Filling in docs.

15 years agoI guess non-READMEs don't need the master part.
Stephen Haberman [Thu, 13 Nov 2008 04:09:31 +0000 (22:09 -0600)]
I guess non-READMEs don't need the master part.

15 years agoNot very good, but rebase vs. merge.
Stephen Haberman [Thu, 13 Nov 2008 04:08:08 +0000 (22:08 -0600)]
Not very good, but rebase vs. merge.

15 years agos/sharing/collaborating
Stephen Haberman [Thu, 13 Nov 2008 04:02:14 +0000 (22:02 -0600)]
s/sharing/collaborating

15 years agoFix link definitions.
Stephen Haberman [Thu, 13 Nov 2008 04:00:50 +0000 (22:00 -0600)]
Fix link definitions.

15 years agoInitial writeup.
Stephen Haberman [Thu, 13 Nov 2008 03:56:30 +0000 (21:56 -0600)]
Initial writeup.

15 years agoAdd documentation for the scripts.
Stephen Haberman [Wed, 12 Nov 2008 07:30:22 +0000 (01:30 -0600)]
Add documentation for the scripts.

15 years agoDropping post-checkout-rebase in favor of pull that does -i-p right.
Stephen Haberman [Wed, 12 Nov 2008 06:41:34 +0000 (00:41 -0600)]
Dropping post-checkout-rebase in favor of pull that does -i-p right.

15 years agoPing.
Stephen Haberman [Wed, 12 Nov 2008 06:39:23 +0000 (00:39 -0600)]
Ping.

15 years agoLink to hooks.
Stephen Haberman [Wed, 12 Nov 2008 06:37:36 +0000 (00:37 -0600)]
Link to hooks.

15 years agoDrop dashes for post-receive-commitnumbers and post-receive-gitconfig.
Stephen Haberman [Wed, 12 Nov 2008 06:17:52 +0000 (00:17 -0600)]
Drop dashes for post-receive-commitnumbers and post-receive-gitconfig.

15 years agoAdd links.
Stephen Haberman [Wed, 12 Nov 2008 06:02:41 +0000 (00:02 -0600)]
Add links.

15 years agoMoving the readme and making it a project-wide overview.
Stephen Haberman [Wed, 12 Nov 2008 05:54:33 +0000 (23:54 -0600)]
Moving the readme and making it a project-wide overview.

15 years agoMerge update-ensure-tag-in-branch itno update-allow-tags-branches.
Stephen Haberman [Wed, 12 Nov 2008 05:53:29 +0000 (23:53 -0600)]
Merge update-ensure-tag-in-branch itno update-allow-tags-branches.

15 years agoUse quotes to avoid unary operator error.
Stephen Haberman [Wed, 12 Nov 2008 05:04:59 +0000 (23:04 -0600)]
Use quotes to avoid unary operator error.

15 years agoUse tags in the email subject to pick up commit numbers.
Stephen Haberman [Wed, 12 Nov 2008 04:43:50 +0000 (22:43 -0600)]
Use tags in the email subject to pick up commit numbers.

15 years agoGo back to using flat files for locking but keep them in the repo-specific GIT_DIR.
Stephen Haberman [Wed, 12 Nov 2008 04:21:52 +0000 (22:21 -0600)]
Go back to using flat files for locking but keep them in the repo-specific GIT_DIR.

15 years agoFix trailing space.
Stephen Haberman [Tue, 11 Nov 2008 23:08:16 +0000 (17:08 -0600)]
Fix trailing space.

15 years agoFix case.
Stephen Haberman [Tue, 11 Nov 2008 23:07:13 +0000 (17:07 -0600)]
Fix case.

15 years agoFix pull in the case when we have no local changes.
Stephen Haberman [Tue, 11 Nov 2008 23:06:43 +0000 (17:06 -0600)]
Fix pull in the case when we have no local changes.

15 years agoRemove cruft hooks, including the dreaded update-prefer-rebase.
Stephen Haberman [Tue, 11 Nov 2008 22:58:53 +0000 (16:58 -0600)]
Remove cruft hooks, including the dreaded update-prefer-rebase.

15 years agoRemove the server-/client- prefixes in the tests.
Stephen Haberman [Tue, 11 Nov 2008 22:45:51 +0000 (16:45 -0600)]
Remove the server-/client- prefixes in the tests.

15 years agoCleaning up scripts to only include useful stuff.
Stephen Haberman [Tue, 11 Nov 2008 22:42:37 +0000 (16:42 -0600)]
Cleaning up scripts to only include useful stuff.

15 years agoFix post-receive-email test for USER_EMAIL variable.
Stephen Haberman [Tue, 11 Nov 2008 22:19:48 +0000 (16:19 -0600)]
Fix post-receive-email test for USER_EMAIL variable.

15 years agoMake the hudson url a config parameter instead of an environment variable.
Stephen Haberman [Tue, 11 Nov 2008 21:51:32 +0000 (15:51 -0600)]
Make the hudson url a config parameter instead of an environment variable.

15 years agoDocument USER_EMAIL.
Stephen Haberman [Tue, 11 Nov 2008 21:44:24 +0000 (15:44 -0600)]
Document USER_EMAIL.

15 years agoPrune contrib-specific docs.
Stephen Haberman [Tue, 11 Nov 2008 21:36:45 +0000 (15:36 -0600)]
Prune contrib-specific docs.

15 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.

15 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.

15 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.

15 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.

15 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.

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

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

15 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.

15 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.

15 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.

15 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.

15 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.

15 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).

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

15 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.

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

15 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.

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

15 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.

15 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).

15 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.

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

15 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.

15 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.

15 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.

15 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.

15 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.

15 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.

15 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.

15 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.

15 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.

15 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.

15 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.

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

15 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.

15 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.

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

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

15 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.

15 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.

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

15 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.

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

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

15 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.

15 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.

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

15 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.

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

15 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.

15 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.

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

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

15 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.

15 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.

15 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.

15 years agoTypo.
Stephen Haberman [Sun, 24 Aug 2008 18:43:05 +0000 (13:43 -0500)]
Typo.

15 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.

15 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.