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

Fix breakage introduced by --minimal patch.
authorJoey Hess <joey@kitenet.net>
Sun, 31 Aug 2014 21:06:03 +0000 (14:06 -0700)
committerJoey Hess <joey@kitenet.net>
Sun, 31 Aug 2014 21:06:03 +0000 (14:06 -0700)
debian/changelog
mr

index 4634b808e686121e92eab08721af3946dc15fa1f..4e6d8783735113c5194d02a6a05af8c75daac07f 100644 (file)
@@ -1,3 +1,9 @@
+myrepos (1.20140831.1) unstable; urgency=medium
+
+  * Fix breakage introduced by --minimal patch.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 31 Aug 2014 14:05:56 -0700
+
 myrepos (1.20140831) unstable; urgency=medium
 
   * Deal with abs_path change in new version of perl, now it returns undefined
diff --git a/mr b/mr
index 98e080c2f4f932cb6f52879a8d4be060c52bba99..d8a27b288cc36081665e9463ac1d626c41659368 100755 (executable)
--- a/mr
+++ b/mr
@@ -853,7 +853,7 @@ sub action {
                }
                print "$actionmsg\n" unless $quiet || $minimal;
 
-               my $hookret=hook("pre_$action", $topdir, $subdir);
+               my ($hookret, $hook_out)=hook("pre_$action", $topdir, $subdir);
                return $hookret if $hookret != OK;
 
                my ($ret, $out)=runsh $action, $topdir, $subdir,
@@ -908,7 +908,7 @@ sub action {
                                                return FAILED;
                                        }
                                }
-                               my $ret=hook("fixups", $topdir, $subdir);
+                               my ($ret, $hook_out)=hook("fixups", $topdir, $subdir);
                                return $ret if $ret != OK;
                        }