summaryrefslogtreecommitdiff
path: root/git-mv.perl
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2005-11-26 02:45:52 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-29 23:34:46 (GMT)
commit4518bb88392fcd44bacae640754e7326a8fdf477 (patch)
treeb73bf209d61345005282900d8b18476d7373fa39 /git-mv.perl
parent034908047d8c46fb4e1323285b3b066567c7fadc (diff)
downloadgit-4518bb88392fcd44bacae640754e7326a8fdf477.zip
git-4518bb88392fcd44bacae640754e7326a8fdf477.tar.gz
git-4518bb88392fcd44bacae640754e7326a8fdf477.tar.bz2
[PATCH] Make git-mv work in subdirectories, too
Turns out, all git programs git-mv uses are capable of operating in a subdirectory just fine. So don't complain about it. [jc: I think that sounds sane. You need to grab the exit status from `git-rev-parse --git-dir`, which I added. Alex Riesen says this worked fine.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-mv.perl')
-rwxr-xr-xgit-mv.perl12
1 files changed, 3 insertions, 9 deletions
diff --git a/git-mv.perl b/git-mv.perl
index 53046ba..b6c0b48 100755
--- a/git-mv.perl
+++ b/git-mv.perl
@@ -19,15 +19,9 @@ EOT
exit(1);
}
-# Sanity checks:
-my $GIT_DIR = $ENV{'GIT_DIR'} || ".git";
-
-unless ( -d $GIT_DIR && -d $GIT_DIR . "/objects" &&
- -d $GIT_DIR . "/objects/" && -d $GIT_DIR . "/refs") {
- print "Error: git repository not found.";
- 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;