From 09381b458f5f1ac1a78df1aaeeb53aa79fcf2c4f Mon Sep 17 00:00:00 2001 From: Julian Phillips Date: Tue, 19 Jun 2007 12:44:43 +0100 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- contrib/workdir/git-new-workdir | 5 +++++ 1 file changed, 5 insertions(+) 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 -- 2.30.2