]> git.madduck.net Git - code/myrepos.git/commitdiff

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:

* Better error message if more than one repo type test matches a single
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 3 Nov 2007 02:42:51 +0000 (22:42 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 3 Nov 2007 02:42:51 +0000 (22:42 -0400)
  directory.

debian/changelog
mr

index bc3b4e65583f4a1be3f652d15ca2ca56a1c5a419..e0214f32798a73b7b72a2a83c6769289f9c71add 100644 (file)
@@ -3,8 +3,10 @@ mr (0.11) UNRELEASED; urgency=low
   * Avoid using commands like git-config and instead use "git config".
     In some configurations, only the main git command is in the path.
   * Allow option bundling, mostly so "-j2" will work.
   * Avoid using commands like git-config and instead use "git config".
     In some configurations, only the main git command is in the path.
   * Allow option bundling, mostly so "-j2" will work.
+  * Better error message if more than one repo type test matches a single
+    directory.
 
 
- -- Joey Hess <joeyh@debian.org>  Thu, 01 Nov 2007 23:52:50 -0400
+ -- Joey Hess <joeyh@debian.org>  Fri, 02 Nov 2007 22:41:44 -0400
 
 mr (0.10) unstable; urgency=low
 
 
 mr (0.10) unstable; urgency=low
 
diff --git a/mr b/mr
index 9501322e7a6d04004266f4a21bdc64136dc2dfc2..62c6be83af2c6dd015fb8cf7aa5104b999af732f 100755 (executable)
--- a/mr
+++ b/mr
@@ -343,6 +343,11 @@ sub rcs_test { #{{{
        print "mr $action: running rcs test >>$test<<\n" if $verbose;
        my $rcs=`$test`;
        chomp $rcs;
        print "mr $action: running rcs test >>$test<<\n" if $verbose;
        my $rcs=`$test`;
        chomp $rcs;
+       if ($rcs=~/\n/s) {
+               $rcs=~s/\n/, /g;
+               print STDERR "mr $action: found multiple possible repository types ($rcs) for $topdir$subdir\n";
+               return undef;
+       }
        if (! length $rcs) {
                return undef;
        }
        if (! length $rcs) {
                return undef;
        }