From: Julian Phillips <julian@quantumfyre.co.uk>
Date: Tue, 19 Jun 2007 11:44:43 +0000 (+0100)
Subject: new-workdir: handle rev-parse --git-dir not always giving full path
X-Git-Tag: v1.5.3-rc0~61
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=09381b458f5f1ac1a78df1aaeeb53aa79fcf2c4f;p=git.git

new-workdir: handle rev-parse --git-dir not always giving full path

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

diff --git a/contrib/workdir/git-new-workdir b/contrib/workdir/git-new-workdir
index f2a3615bb..709b2a3ac 100755
--- a/contrib/workdir/git-new-workdir
+++ b/contrib/workdir/git-new-workdir
@@ -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