new-workdir: handle rev-parse --git-dir not always giving full path
authorJulian Phillips <julian@quantumfyre.co.uk>
Tue, 19 Jun 2007 11:44:43 +0000 (12:44 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sun, 24 Jun 2007 09:36:56 +0000 (02:36 -0700)
rev-parse --git-dir outputs a full path - except for the single case
of when the path would be $(pwd)/.git, in which case it outputs simply
.git. Check for this special case and handle it.

Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/workdir/git-new-workdir
index f2a3615bbc44ed4edbee4014683621a91c1a7ab9..709b2a3ac0e7603eadd9f62a795967c415d554df 100755 (executable)
@@ -24,6 +24,11 @@ git_dir=$(cd "$orig_git" 2>/dev/null &&
   git rev-parse --git-dir 2>/dev/null) ||
   die "\"$orig_git\" is not a git repository!"
 
+if test "$git_dir" == ".git"
+then
+       git_dir="$orig_git/.git"
+fi
+
 # don't link to a workdir
 if test -L "$git_dir/config"
 then