git-mv: Allow -h without repo & fix error message

This fixes "git-mv -h" to output the usage without the need
to be in a git repository.
Additionally:
- fix confusing error message when only one arg was given
- fix typo in error message

Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-mv.perl b/git-mv.perl
index 2ea852c9185743d5b84523698cbffaaffb238543..8cd95c472ffb7b86fcd1faa0c7b8d365029b9597 100755 (executable)
--- a/git-mv.perl
+++ b/git-mv.perl
@@ -19,15 +19,15 @@ ()
        exit(1);
 }
 
        exit(1);
 }
 

-my $GIT_DIR = `git rev-parse --git-dir`;
-exit 1 if $?; # rev-parse would have given "not a git dir" message.
-chomp($GIT_DIR);
-

 our ($opt_n, $opt_f, $opt_h, $opt_k, $opt_v);
 getopts("hnfkv") || usage;
 usage() if $opt_h;
 @ARGV >= 1 or usage;
 
 our ($opt_n, $opt_f, $opt_h, $opt_k, $opt_v);
 getopts("hnfkv") || usage;
 usage() if $opt_h;
 @ARGV >= 1 or usage;
 

+my $GIT_DIR = `git rev-parse --git-dir`;
+exit 1 if $?; # rev-parse would have given "not a git dir" message.
+chomp($GIT_DIR);
+

 my (@srcArgs, @dstArgs, @srcs, @dsts);
 my ($src, $dst, $base, $dstDir);
 
 my (@srcArgs, @dstArgs, @srcs, @dsts);
 my ($src, $dst, $base, $dstDir);
 


@@ -46,10 +46,14 @@ ()
        }
 }
 else {
        }
 }
 else {

-    if ($argCount != 2) {
+    if ($argCount < 2) {
+       print "Error: need at least two arguments\n";
+       exit(1);
+    }
+    if ($argCount > 2) {

        print "Error: moving to directory '"
            . $ARGV[$argCount-1]
        print "Error: moving to directory '"
            . $ARGV[$argCount-1]

-           . "' not possible; not exisiting\n";
+           . "' not possible; not existing\n";

        exit(1);
     }
     @srcArgs = ($ARGV[0]);
        exit(1);
     }
     @srcArgs = ($ARGV[0]);