* -c was broken, fix. Closes: #449539

diff --git a/debian/changelog b/debian/changelog
index 466f0335fb16180a63739595bbddeaedab2e8456..c2566c6a8e4a28aa97e5c3a3c7273fa039aa8190 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mr (0.13) unstable; urgency=low
+
+  * -c was broken, fix. Closes: #449539
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 06 Nov 2007 11:39:04 -0500
+

 mr (0.12) unstable; urgency=low
 
   * Avoid creating parent directory for a checkout that will ultimately be
 mr (0.12) unstable; urgency=low
 
   * Avoid creating parent directory for a checkout that will ultimately be

diff --git a/mr b/mr
index 29001e0446c5bc4c72333d9b056c04d997a3703d..6406978d7682c53aa7667a7f27a28c66c7e68cfb 100755 (executable)
--- a/mr
+++ b/mr
@@ -313,6 +313,7 @@ my $no_recurse=0;
 my $no_chdir=0;
 my $jobs=1;
 my $directory=getcwd();
 my $no_chdir=0;
 my $jobs=1;
 my $directory=getcwd();

+$ENV{MR_CONFIG}="$ENV{HOME}/.mrconfig";

 
 # globals :-(
 my %config;
 
 # globals :-(
 my %config;


@@ -1051,8 +1052,6 @@ sub init { #{{{
                exit 2;
        };
        
                exit 2;
        };
        

-       $ENV{MR_CONFIG}="$ENV{HOME}/.mrconfig";
-

        # This can happen if it's run in a directory that was removed
        # or other strangeness.
        if (! defined $directory) {
        # This can happen if it's run in a directory that was removed
        # or other strangeness.
        if (! defined $directory) {