From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 2 Aug 2008 16:30:33 +0000 (-0400)
Subject: Fix bug when remembering failed commands in offline mode.
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/7ec67608cca6d2ca8095c2ebf0585e36431056ea?ds=sidebyside

Fix bug when remembering failed commands in offline mode.
---

diff --git a/debian/changelog b/debian/changelog
index 934c37e..0067088 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mr (0.34) unstable; urgency=low
+
+  * Fix bug when remembering failed commands in offline mode.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 02 Aug 2008 12:27:21 -0400
+
 mr (0.33) unstable; urgency=low
 
   * Add a push subcommand, which pushes committed changes for DCVS, and 
diff --git a/mr b/mr
index e76887e..883f4fb 100755
--- a/mr
+++ b/mr
@@ -451,7 +451,7 @@ sub findcommand { #{{{
 
 sub action { #{{{
 	my ($action, $dir, $topdir, $subdir) = @_;
-
+	
 	$ENV{MR_CONFIG}=$configfiles{$topdir};
 	my $lib=exists $config{$topdir}{$subdir}{lib} ?
 	               $config{$topdir}{$subdir}{lib}."\n" : "";
@@ -546,8 +546,10 @@ sub action { #{{{
 				if (-e "$ENV{HOME}/.mrlog" && $action ne 'remember') {
 					# recreate original command line to
 					# remember, and avoid recursing
-					@ARGV=('-n', $action, @ARGV);
+					my @orig=@ARGV;
+					@ARGV=('-n', $action, @orig);
 					action("remember", $dir, $topdir, $subdir);
+					@ARGV=@orig;
 				}
 			}
 			elsif ($ret != 0) {