From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Sat, 26 Nov 2005 02:45:52 +0000 (-0800)
Subject: [PATCH] Make git-mv work in subdirectories, too
X-Git-Tag: v0.99.9l^2~29
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4518bb88392fcd44bacae640754e7326a8fdf477;p=git.git

[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>
---

diff --git a/git-mv.perl b/git-mv.perl
index 53046bafd..b6c0b4881 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;