git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "martin f. krafft" <madduck@debian.org>
To: git@vger.kernel.org, pasky@suse.cz
Cc: "martin f. krafft" <madduck@debian.org>
Subject: [TopGit PATCH] Ensure we are inside a Git worktree
Date: Fri, 21 Nov 2008 13:09:16 +0100	[thread overview]
Message-ID: <1227269356-19093-1-git-send-email-madduck@debian.org> (raw)
In-Reply-To: <20081121120609.GA10326@piper.oerlikon.madduck.net>

Bert Wesarg suggests to check that we are not inside the .git directory before
setting up topgit. Because git rev-parse --git-dir only works in the top .git
dir, not deeper (i.e. inside .git/refs) and will always return "."

This patch thus causes topgit to die early on when it's called from outside of
a Git repository, or from underneath .git and outputs error messages
accordingly.

This temporarily makes it even more impossible to call tg --help, but I expect
to have that fixed soon too.

Signed-off-by: martin f. krafft <madduck@debian.org>

---
 tg.sh |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/tg.sh b/tg.sh
index 8c23d26..f8c8de4 100644
--- a/tg.sh
+++ b/tg.sh
@@ -17,6 +17,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
+}
+
 # setup_hook NAME
 setup_hook()
 {
@@ -249,6 +263,8 @@ do_help()
 [ -d "@cmddir@" ] ||
 	die "No command directory: '@cmddir@'"
 
+ensure_git_repo_or_die
+
 ## Initial setup
 
 set -e
-- 
tg: (2ea19b6..) fixes/ensure-worktree (depends on: upstream)

  reply	other threads:[~2008-11-21 12:10 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-19 16:03 [TopGit] Improve help output martin f. krafft
2008-11-19 16:03 ` [TopGit PATCH] Check for help invocation before setup martin f. krafft
2008-11-19 16:03   ` [TopGit PATCH] Change tg help exit code to 0 martin f. krafft
2008-11-19 16:03     ` [TopGit PATCH] Check for cmddir earlier martin f. krafft
2008-11-19 16:03       ` [TopGit PATCH] Print help output when no command is given martin f. krafft
2008-11-19 18:24   ` [TopGit PATCH] Check for help invocation before setup Petr Baudis
2008-11-19 18:32     ` martin f krafft
2008-11-19 18:39       ` Petr Baudis
2008-11-20 11:48         ` martin f krafft
2008-11-21  9:19   ` Bert Wesarg
2008-11-21 12:06     ` TopGit: ensure worktree (was: [TopGit PATCH] Check for help invocation before setup) martin f krafft
2008-11-21 12:09       ` martin f. krafft [this message]
2008-11-21 12:15       ` Bert Wesarg
2008-11-21 12:18         ` Bert Wesarg
2008-11-21 12:31           ` martin f krafft
2008-11-21 12:23         ` martin f krafft

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1227269356-19093-1-git-send-email-madduck@debian.org \
    --to=madduck@debian.org \
    --cc=git@vger.kernel.org \
    --cc=pasky@suse.cz \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).