git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: koreth@midwinter.com
To: Andy Parkins <andyparkins@gmail.com>
Cc: git@vger.kernel.org
Subject: [PATCH] Friendlier error message for commands that can't be run from a subdirectory.
Date: Fri, 12 Jan 2007 10:35:48 -0800	[thread overview]
Message-ID: <20070112183548.GA3940@midwinter.com> (raw)
In-Reply-To: <200701121501.24642.andyparkins@gmail.com>

Signed-off-by: Steven Grimm <koreth@midwinter.com>
---

This doesn't fix the underlying problem (those commands ought to work
from any directory) but it is at least less baffling for the common case.
It's pretty braindead -- if you for some reason have a .git directory
inside one of your subdirectories, you'll get the old error message.

 git-sh-setup.sh |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 4a02b38..803a3bc 100755
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -60,6 +60,9 @@ esac
 if [ -z "$SUBDIRECTORY_OK" ]
 then
 	: ${GIT_DIR=.git}
+	if [ ! -d "$GIT_DIR" ]; then
+		die "This command must be run from the root directory of a git repository."
+	fi
 	GIT_DIR=$(GIT_DIR="$GIT_DIR" git-rev-parse --git-dir) || exit
 else
 	GIT_DIR=$(git-rev-parse --git-dir) || exit
-- 
1.5.0.rc0.g4083

  reply	other threads:[~2007-01-12 18:35 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-01-12  2:43 What's in git.git and announcing GIT v1.5.0-rc1 Junio C Hamano
2007-01-12  3:59 ` [PATCH] reflog-expire: brown paper bag fix Junio C Hamano
2007-01-12  4:02   ` Shawn O. Pearce
2007-01-12 15:01 ` What's in git.git and announcing GIT v1.5.0-rc1 Andy Parkins
2007-01-12 18:35   ` koreth [this message]
2007-01-12 18:39   ` Steven Grimm
2007-01-12 19:10   ` [PATCH] Change to the repository's root directory if needed koreth
2007-01-12 21:18     ` Junio C Hamano
2007-01-12 22:11       ` Steven Grimm
2007-01-12 23:17         ` Junio C Hamano
2007-01-12 20:26   ` [PATCH] Explain "Not a git repository: '.git'" Junio C Hamano
2007-01-12 20:55     ` Junio C Hamano
2007-01-12 20:55     ` [PATCH 1/3] Define cd_to_toplevel shell function in git-sh-setup Junio C Hamano
2007-01-12 20:55     ` [PATCH 2/3] Use cd_to_toplevel in scripts that implement it by hand Junio C Hamano
2007-01-12 20:56     ` [PATCH 3/3] Allow whole-tree operations to be started from a subdirectory Junio C Hamano
2007-01-13 16:42       ` Andy Parkins
2007-01-14  0:11       ` Josef Weidendorfer
2007-01-14  0:21         ` Shawn O. Pearce
2007-01-14  0:39           ` Josef Weidendorfer
2007-01-14  0:50         ` Junio C Hamano
2007-01-14  0:52         ` Steven Grimm
2007-01-14  1:37           ` Junio C Hamano
2007-01-14 18:13             ` Steven Grimm
2007-01-14 18:29               ` Steven Grimm
2007-01-14 19:36               ` Junio C Hamano
2007-01-14  1:50           ` Junio C Hamano
2007-01-16 15:14         ` Andreas Ericsson
2007-01-14 23:36 ` What's in git.git and announcing GIT v1.5.0-rc1 lamikr
2007-01-15  2:21   ` Horst H. von Brand
2007-01-15 20:54     ` lamikr
2007-01-15 21:56       ` Junio C Hamano

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=20070112183548.GA3940@midwinter.com \
    --to=koreth@midwinter.com \
    --cc=andyparkins@gmail.com \
    --cc=git@vger.kernel.org \
    /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).