]>
git.madduck.net Git - code/myrepos.git/log
madduck's git repository
Every one of the projects in this repository is available at the canonical
URL git://git.madduck.net/madduck/pub/<projectpath> — see
each project's metadata for the exact URL.
All patches and comments are welcome. Please squash your changes to logical
commits before using git-format-patch and git-send-email to
patches@ git. madduck. net .
If you'd read over the Git project's submission guidelines and adhered to them,
I'd be especially grateful.
SSH access, as well as push access can be individually
arranged .
If you use my repositories frequently, consider adding the following
snippet to ~/.gitconfig and using the third clone URL listed for each
project:
[url "git://git.madduck.net/madduck/"]
insteadOf = madduck:
Joey Hess [Sun, 25 Sep 2011 22:43:05 +0000 (18:43 -0400)]
add back a long-lost example
Joey Hess [Sun, 25 Sep 2011 22:26:54 +0000 (18:26 -0400)]
update
Joey Hess [Sun, 25 Sep 2011 22:26:08 +0000 (18:26 -0400)]
expand
Joey Hess [Fri, 23 Sep 2011 17:20:39 +0000 (13:20 -0400)]
changelog
Julien Rebetez [Thu, 15 Sep 2011 13:12:21 +0000 (15:12 +0200)]
Patch to correctly handle fake bare repositories with core.bare not set
--
20cf300513b2820cbe04acfaa084
Content-Type: text/plain; charset=ISO-8859-1
Hello,
First, thanks for writing mr, I love it !
I was trying to setup mr to handle a detached worktree git repository and
found out it was unable to determine the repository type.
It turned out my config only had "core.worktree=../../" set but no
"core.bare" and therefore, 'git_fake_bare_test' was unable to determine
it's a detached worktree dir.
So the attached patch fix this problem by checking for core.worktree instead
of core.bare in the config file.
Best regards,
Julien
Hello,<div>First, thanks for writing mr, I love it !</div><div><br><div>I was trying to setup mr to handle a detached worktree git repository and found out it was unable to determine the repository type. </div><div>It turned out my config only had "core.worktree=../../" set but no "core.bare" and therefore, 'git_fake_bare_test' was unable to determine</div>
<div>it's a detached worktree dir.</div><div><br></div><div>So the attached patch fix this problem by checking for core.worktree instead of core.bare in the config file.</div><div><br></div></div><div>Best regards,</div>
<div>Julien</div>
From
b1c62a06c6c3668c52dd90014325d0c831a45ae7 Mon Sep 17 00:00:00 2001
From: Julien Rebetez <julien@fhtagn.net>
Date: Thu, 15 Sep 2011 14:59:47 +0200
Subject: [PATCH] Modify git_fake_bare_test to check core.worktree instead of
core.bare to determine if a given repository is a detached
worktree ('fake bar').
This allow mr to correctly handle the case where core.bare is missing
from the config file (implicitely false) and only core.worktree is set.
Signed-off-by: Julien Rebetez <julien@fhtagn.net>
Joey Hess [Fri, 5 Aug 2011 17:29:42 +0000 (13:29 -0400)]
Avoid using sed -r in git-fake-bare, for OSX portability.
Joey Hess [Sun, 19 Jun 2011 20:54:21 +0000 (16:54 -0400)]
forgot to add this before
Joey Hess [Sun, 19 Jun 2011 20:24:19 +0000 (16:24 -0400)]
releasing version 1.04
Joey Hess [Sat, 11 Jun 2011 16:31:24 +0000 (12:31 -0400)]
Allow mr register to be used with mrconfig file that does not yet exist. Closes: #629217
Joey Hess [Mon, 30 May 2011 18:55:27 +0000 (14:55 -0400)]
Improve trust errors displayed while bootstrapping. Closes: #628234
Svend Sorensen [Fri, 6 May 2011 17:45:24 +0000 (10:45 -0700)]
git-subtree: Display short-format status message
Add the -s flag to git status and exit successfully. This makes
git-subtree status behave like git status. mr's git status command is:
git_status = git status -s "$@" || true
Joey Hess [Sun, 1 May 2011 23:10:03 +0000 (19:10 -0400)]
releasing version 1.03
Joey Hess [Tue, 26 Apr 2011 00:04:16 +0000 (20:04 -0400)]
remove quietupdate hack
Joey Hess [Mon, 25 Apr 2011 23:47:45 +0000 (19:47 -0400)]
bugnum
Joey Hess [Mon, 25 Apr 2011 23:47:07 +0000 (19:47 -0400)]
Now --quiet supresses all output from commands run, as well as from mr, unless a command fails.
Joey Hess [Mon, 28 Mar 2011 21:05:20 +0000 (17:05 -0400)]
Added git-subtree library. Thanks, Svend Sorensen
Svend Sorensen [Mon, 28 Mar 2011 17:52:43 +0000 (10:52 -0700)]
Add support for for git-subtree
This lib allows you to merge separate git repos into a single repo, and
push changes back to the separate repos.
See https://github.com/apenwarr/git-subtree for the git-subtree command.
Joey Hess [Sat, 5 Feb 2011 01:10:34 +0000 (21:10 -0400)]
update
Joey Hess [Sat, 5 Feb 2011 01:10:23 +0000 (21:10 -0400)]
fix url
Matthew McCullough [Fri, 4 Feb 2011 21:42:38 +0000 (14:42 -0700)]
Adding homepage and descriptive information to the README
Joey Hess [Sat, 22 Jan 2011 05:19:02 +0000 (01:19 -0400)]
releasing version 1.02
Joey Hess [Sat, 22 Jan 2011 05:05:08 +0000 (01:05 -0400)]
Fix bug in escaping.
Joey Hess [Thu, 20 Jan 2011 20:51:39 +0000 (16:51 -0400)]
releasing version 1.01
Joey Hess [Thu, 20 Jan 2011 20:48:24 +0000 (16:48 -0400)]
Add "mr run", which can run an arbitrary command in each repository.
Joey Hess [Wed, 19 Jan 2011 18:29:26 +0000 (14:29 -0400)]
releasing version 1.00
Joey Hess [Wed, 19 Jan 2011 18:28:06 +0000 (14:28 -0400)]
The -p flag is now enabled by default.
mr first reads ~/.mrconfig, and then looks for an additional .mrconfig file in
the current directory or one of its parent directories. Closes: #557963
Joey Hess [Wed, 19 Jan 2011 18:09:53 +0000 (14:09 -0400)]
Trust flag day.
All mrconfig files except the main ~/.mrconfig are now untrusted by
default, until listed in ~/.mrtrust.
Joey Hess [Thu, 13 Jan 2011 22:54:48 +0000 (18:54 -0400)]
DEP5
Joey Hess [Thu, 16 Dec 2010 17:15:05 +0000 (13:15 -0400)]
releasing version 0.51
Joey Hess [Thu, 16 Dec 2010 16:53:30 +0000 (12:53 -0400)]
Do not return a nonzero exit status when all repositories were skipped. Closes: #607287
Joey Hess [Wed, 10 Nov 2010 15:03:02 +0000 (11:03 -0400)]
Add push to manpage synopsis. Closes: #603029
Joey Hess [Thu, 28 Oct 2010 22:02:21 +0000 (18:02 -0400)]
Fix display when absolute directories are configured in mrconfig.
Joey Hess [Sun, 29 Aug 2010 19:04:48 +0000 (15:04 -0400)]
another example of fixups hook
Joey Hess [Sun, 29 Aug 2010 19:01:20 +0000 (15:01 -0400)]
releasing version 0.50
Joey Hess [Sun, 29 Aug 2010 18:53:57 +0000 (14:53 -0400)]
Added support for arbitrary pre and post hooks for all defined mr commands. For example, pre_commit is run before all commits; post_update is run after all updates. Closes: #481341
Joey Hess [Sun, 29 Aug 2010 18:44:18 +0000 (14:44 -0400)]
Added fixups hook, which can be used to run a command after a repository is checked out or updated. Closes: #590868
Joey Hess [Sun, 15 Aug 2010 16:38:36 +0000 (12:38 -0400)]
update
Joey Hess [Sun, 15 Aug 2010 16:36:28 +0000 (12:36 -0400)]
fix quoting
Joey Hess [Sun, 15 Aug 2010 16:35:18 +0000 (12:35 -0400)]
revert unnecessary line move
Joey Hess [Sun, 15 Aug 2010 16:34:55 +0000 (12:34 -0400)]
typo
Jimmy Tang [Sun, 15 Aug 2010 00:17:37 +0000 (01:17 +0100)]
Added fossil support
Joey Hess [Mon, 19 Jul 2010 03:09:28 +0000 (23:09 -0400)]
releasing version 0.49
Joey Hess [Tue, 13 Jul 2010 16:30:28 +0000 (12:30 -0400)]
Typo. Closes: #586233, #588913
Joey Hess [Thu, 17 Jun 2010 17:32:48 +0000 (13:32 -0400)]
Typo. Closes: #586233
Joey Hess [Thu, 17 Jun 2010 17:19:12 +0000 (13:19 -0400)]
Use short mode status output for git and bzr.
Joey Hess [Mon, 24 May 2010 15:12:47 +0000 (11:12 -0400)]
use dpkg-mergechangelog
Joey Hess [Tue, 11 May 2010 23:51:08 +0000 (19:51 -0400)]
remove quotes
Joey Hess [Thu, 8 Apr 2010 20:07:03 +0000 (16:07 -0400)]
Update suggests for git-core to git transition.
Joey Hess [Fri, 5 Feb 2010 22:15:38 +0000 (17:15 -0500)]
releasing version 0.48
Joey Hess [Fri, 5 Feb 2010 22:13:17 +0000 (17:13 -0500)]
Fix the hours_since function built into mr's shell library to not exit, but return a true/false exit status. This allows it to be used outside of skip tests.
Joey Hess [Fri, 5 Feb 2010 21:41:25 +0000 (16:41 -0500)]
releasing version 0.47
Joey Hess [Thu, 24 Dec 2009 17:23:27 +0000 (12:23 -0500)]
Allow empty sections to be used in mrconfig files.
Previously the parser only added a section if it had at least one
configuration line. With this change, an empty section cannot be checked
out by mr, but it can be updated, etc.
Joey Hess [Sun, 13 Dec 2009 18:05:27 +0000 (13:05 -0500)]
Pass -L to curl to allow it to follow redirects when bootstrapping. (Pavel Avgustinov)
Joey Hess [Thu, 10 Dec 2009 22:29:50 +0000 (17:29 -0500)]
Avoid using abs_path to determine canonical repo path, as that fails when the repo has not yet been checked out.
Joey Hess [Tue, 8 Dec 2009 20:06:03 +0000 (15:06 -0500)]
releasing version 0.45
Joey Hess [Tue, 8 Dec 2009 19:57:50 +0000 (14:57 -0500)]
Fix handling of a repository in "."
I threw in an abs_path because a repository in "." would turn into
something like "/home/joey/."
I think this is a reasonably safe change.
Joey Hess [Mon, 30 Nov 2009 19:45:53 +0000 (14:45 -0500)]
Add --insecure option that can be used to ignore SSL cert errors when bootstrapping. (Pavel Avgustinov)
Pavel Avgustinov [Sun, 29 Nov 2009 14:37:12 +0000 (14:37 +0000)]
Add -k/--insecure option to ignore SSL errors on bootstrap.
Joey Hess [Fri, 27 Nov 2009 17:52:33 +0000 (12:52 -0500)]
clarify
Joey Hess [Fri, 27 Nov 2009 17:47:46 +0000 (12:47 -0500)]
bootstrap: Improve stats display.
Joey Hess [Thu, 26 Nov 2009 20:22:13 +0000 (15:22 -0500)]
merge from my real .mrconfig, and remove some stuff
Joey Hess [Thu, 26 Nov 2009 20:12:38 +0000 (15:12 -0500)]
bugnum
Joey Hess [Thu, 26 Nov 2009 20:09:21 +0000 (15:09 -0500)]
thoughts on -p as default
Joey Hess [Thu, 26 Nov 2009 17:08:40 +0000 (12:08 -0500)]
omit \n between repos in quiet mode
Joey Hess [Thu, 26 Nov 2009 16:56:50 +0000 (11:56 -0500)]
use [.] instead of []
[] only works at all due to implementation details and users
should not need to worry about it. mr bootstrap only support [.]
Joey Hess [Wed, 25 Nov 2009 22:27:38 +0000 (17:27 -0500)]
Fix pod error. Closes: #558012
Joey Hess [Wed, 25 Nov 2009 18:03:39 +0000 (13:03 -0500)]
releasing version 0.44
Joey Hess [Wed, 25 Nov 2009 17:38:01 +0000 (12:38 -0500)]
recommend perl to get perl-modules including File::Temp and File::Move
Only used by bootstrap, so recommends seems ok.
Joey Hess [Wed, 25 Nov 2009 17:36:17 +0000 (12:36 -0500)]
mr bootstrap: Fix cross-device rename failure. Closes: #557962
Joey Hess [Tue, 3 Nov 2009 00:24:57 +0000 (19:24 -0500)]
changelog
Joey Hess [Tue, 3 Nov 2009 00:24:23 +0000 (19:24 -0500)]
de-hardcode paths
Joey Hess [Tue, 3 Nov 2009 00:23:54 +0000 (19:23 -0500)]
Merge branch 'master' of git://github.com/geoffdavis/mr
Geoff Davis [Mon, 2 Nov 2009 20:26:20 +0000 (12:26 -0800)]
Fix help page display on Solaris and OS X
mr assumed that we were using Linux/GNU man. Added logic to detect SunOS
and Darwin, and call man with the appropriate arguments
Joey Hess [Fri, 25 Sep 2009 15:43:31 +0000 (11:43 -0400)]
typo
Joey Hess [Fri, 25 Sep 2009 01:52:51 +0000 (21:52 -0400)]
Make mr -i pass -i to the shell, to insure it knows it should be an interactive shell.
Joey Hess [Wed, 9 Sep 2009 00:25:00 +0000 (20:25 -0400)]
releasing version 0.43
Joey Hess [Wed, 9 Sep 2009 00:20:25 +0000 (20:20 -0400)]
mr bootstrap enhancements for d-i
* mr bootstrap: Allow a directory to checkout into to be specified,
and create it if necessary.
* mr bootstrap: If the mrconfig file contains a repository named ".",
check it out into the top level of the directory bootstrapped.
Joey Hess [Mon, 7 Sep 2009 16:29:40 +0000 (12:29 -0400)]
Man page typo. Closes: #545412
Joey Hess [Sun, 16 Aug 2009 15:36:47 +0000 (11:36 -0400)]
Set User-Agent to "mr" when downloading the mrconfig file with mr bootstrap. Closes: #541778
Joey Hess [Fri, 7 Aug 2009 20:49:40 +0000 (16:49 -0400)]
releasing version 0.42
Joey Hess [Fri, 7 Aug 2009 20:45:20 +0000 (16:45 -0400)]
document long options in man page
Joey Hess [Fri, 7 Aug 2009 20:42:57 +0000 (16:42 -0400)]
add --trust-all option for test suite
Joey Hess [Fri, 7 Aug 2009 05:14:07 +0000 (01:14 -0400)]
Add support for ~/.mrtrust, which can be used to list trusted mrconfig files.
If you create this file, all files not listed in it will be treated as
untrusted, and carefully limited in what they can do. This improves
security when using mrconfig files provided by others.
Joey Hess [Fri, 7 Aug 2009 02:43:06 +0000 (22:43 -0400)]
releasing version 0.41
Joey Hess [Fri, 7 Aug 2009 02:36:30 +0000 (22:36 -0400)]
Add `mr bootstrap`
which downloads an url to a .mrconfig file in the current directory and
then checks out all repositories configured in it.
This is intended for projects that want to publish a mrconfig file to
automate use of their several repositories.
Joey Hess [Fri, 7 Aug 2009 02:14:22 +0000 (22:14 -0400)]
Add -p switch, that makes mr search the current directory and its parents for a .mrconfig file to use. Useful for projects that want to publish a mrconfig file to use to check out their several repositories, without requiring users put it anywhere in particular.
Joey Hess [Sat, 1 Aug 2009 02:32:39 +0000 (22:32 -0400)]
releasing version 0.40
Joey Hess [Tue, 21 Apr 2009 20:14:22 +0000 (16:14 -0400)]
typo
Joey Hess [Thu, 16 Apr 2009 17:12:25 +0000 (13:12 -0400)]
Use pass --pull to bzr merge to avoid needing to commit merged changes. Closes: #524352
Joey Hess [Thu, 9 Apr 2009 22:59:34 +0000 (18:59 -0400)]
move less important file to end of section
Joey Hess [Tue, 10 Mar 2009 02:51:22 +0000 (22:51 -0400)]
releasing version 0.39
Joey Hess [Sun, 1 Mar 2009 20:10:27 +0000 (15:10 -0500)]
changelog
martin f. krafft [Sun, 1 Mar 2009 18:49:20 +0000 (19:49 +0100)]
Determine current branch for fake-bare update
Do not use master, but use the branch currently checked out.
Signed-off-by: martin f. krafft <madduck@madduck.net>
Joey Hess [Thu, 22 Jan 2009 20:39:36 +0000 (15:39 -0500)]
Remove gitless lib. It turned out to be better to simply use git clone --shared when checking out. Sorry for the churn..
Joey Hess [Thu, 22 Jan 2009 07:54:34 +0000 (02:54 -0500)]
gitless: Use --shared when cloning repos, avoids problems with hard links etc.
Joey Hess [Wed, 21 Jan 2009 06:47:03 +0000 (01:47 -0500)]
releasing version 0.37
Joey Hess [Tue, 20 Jan 2009 23:46:29 +0000 (18:46 -0500)]
Revert "fix a few more messages for absolute paths"
This reverts commit
689a4dea790ed14a4b209300a48a4eb24cedf083 .
Conflicts:
mr
Joey Hess [Tue, 20 Jan 2009 23:45:49 +0000 (18:45 -0500)]
Revert "Fix display of repos configured at absolute path locations."
This reverts commit
494d586d154db49a4210a989878c3e76aa22206d .
Conflicts:
debian/changelog
mr
This change broke display of checkouts.
Joey Hess [Sat, 17 Jan 2009 20:01:23 +0000 (15:01 -0500)]
turn off auto gc
Joey Hess [Fri, 16 Jan 2009 04:04:07 +0000 (23:04 -0500)]
checkout with reset --hard
this is less prone to failure, and shows a progress bar