mirror of
https://github.com/git/git.git
synced 2024-10-31 06:17:56 +01:00
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>
This commit is contained in:
parent
573464319f
commit
5e6f85f6c1
1 changed files with 10 additions and 6 deletions
16
git-mv.perl
16
git-mv.perl
|
@ -19,15 +19,15 @@ ()
|
|||
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;
|
||||
|
||||
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);
|
||||
|
||||
|
@ -46,10 +46,14 @@ ()
|
|||
}
|
||||
}
|
||||
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]
|
||||
. "' not possible; not exisiting\n";
|
||||
. "' not possible; not existing\n";
|
||||
exit(1);
|
||||
}
|
||||
@srcArgs = ($ARGV[0]);
|
||||
|
|
Loading…
Reference in a new issue