From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 28 Dec 2011 01:52:01 +0000 (+0000)
Subject: Merge branch 'fixes/ensure-worktree' into refs/top-bases/i/basis-merge
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=commitdiff_plain;h=8cf11543aebd8cf79555a1668f718e8950e3e4a8;hp=ced323f9e0c5d7e3f009aa33d53f6fb514143bed

Merge branch 'fixes/ensure-worktree' into refs/top-bases/i/basis-merge
---

diff --git a/tg.sh b/tg.sh
index 30217e9..ffc120a 100644
--- a/tg.sh
+++ b/tg.sh
@@ -18,6 +18,20 @@ die()
 	exit 1
 }
 
+# Make sure we are in the worktree, not under .git; die otherwise
+ensure_git_repo_or_die()
+{
+	local is_inside_repo is_inside_git_dir
+	is_inside_repo=1
+	is_inside_git_dir=$(git rev-parse --is-inside-git-dir 2>/dev/null) ||
+		is_inside_repo=0
+
+	case "$is_inside_repo/$is_inside_git_dir" in
+	0*) die "Cannot run outside of a Git repository.";;
+	1/true) die "Cannot run from inside \`.git\` hierarchy, please switch to work-tree.";;
+	esac
+}
+
 # cat_file TOPIC:PATH [FROM]
 # cat the file PATH from branch TOPIC when FROM is empty.
 # FROM can be -i or -w, than the file will be from the index or worktree,
@@ -427,6 +441,8 @@ get_temp()
 [ -d "@cmddir@" ] ||
 	die "No command directory: '@cmddir@'"
 
+ensure_git_repo_or_die
+
 ## Initial setup
 
 set -e