]> 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:

actions not split by rcs override those that are
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 26 Oct 2007 02:07:32 +0000 (22:07 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 26 Oct 2007 02:07:32 +0000 (22:07 -0400)
mr

diff --git a/mr b/mr
index e927a125bdf97c92bd5ffbf1ae6854a175678c04..74d0129432c3f701a0f29c2b816b4eb1a85583ab 100755 (executable)
--- a/mr
+++ b/mr
@@ -570,6 +570,10 @@ sub rcs_test { #{{{
        
 sub findcommand { #{{{
        my ($action, $dir, $topdir, $subdir) = @_;
        
 sub findcommand { #{{{
        my ($action, $dir, $topdir, $subdir) = @_;
+       
+       if (exists $config{$topdir}{$subdir}{$action}) {
+               return $config{$topdir}{$subdir}{$action};
+       }
 
        my $rcs=rcs_test(@_);
 
 
        my $rcs=rcs_test(@_);
 
@@ -577,9 +581,6 @@ sub findcommand { #{{{
            exists $config{$topdir}{$subdir}{$rcs."_".$action}) {
                return $config{$topdir}{$subdir}{$rcs."_".$action};
        }
            exists $config{$topdir}{$subdir}{$rcs."_".$action}) {
                return $config{$topdir}{$subdir}{$rcs."_".$action};
        }
-       elsif (exists $config{$topdir}{$subdir}{$action}) {
-               return $config{$topdir}{$subdir}{$action};
-       }
        else {
                return undef;
        }
        else {
                return undef;
        }