From: Junio C Hamano <gitster@pobox.com>
To: Alexandre Julliard <julliard@winehq.org>
Cc: git@vger.kernel.org, Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Subject: Re: [PATCH] emacs: make 'git-status' work with separate git dirs
Date: Sat, 24 Nov 2012 22:22:32 -0800 [thread overview]
Message-ID: <7v4nkeyzfb.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1353599934-23222-1-git-send-email-enrico.scholz@sigma-chemnitz.de> (Enrico Scholz's message of "Thu, 22 Nov 2012 16:58:54 +0100")
Enrico Scholz <enrico.scholz@sigma-chemnitz.de> writes:
> when trying 'M-x git-status' in a submodule created with recent (1.7.5+)
> git, the command fails with
>
> | ... is not a git working tree
>
> This is caused by creating submodules with '--separate-git-dir' but
> still checking for a working tree by testing for a '.git' directory.
>
> The patch fixes this by relaxing the existing detection a little bit.
>
> Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
> ---
This script already relies on the assumption that nobody sane would
create a directory named ".git" that is not a git repository, and
this loosens the assumption that nobody would create a file named
".git", either. So I would think it is a sane thing to do, but just
in case if the area expert has better ideas, I am forwarding it.
Ack?
> contrib/emacs/git.el | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
> index 65c95d9..5ffc506 100644
> --- a/contrib/emacs/git.el
> +++ b/contrib/emacs/git.el
> @@ -1671,7 +1671,7 @@ Commands:
> "Entry point into git-status mode."
> (interactive "DSelect directory: ")
> (setq dir (git-get-top-dir dir))
> - (if (file-directory-p (concat (file-name-as-directory dir) ".git"))
> + (if (file-exists-p (concat (file-name-as-directory dir) ".git"))
> (let ((buffer (or (and git-reuse-status-buffer (git-find-status-buffer dir))
> (create-file-buffer (expand-file-name "*git-status*" dir)))))
> (switch-to-buffer buffer)
next prev parent reply other threads:[~2012-11-25 6:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-22 15:58 [PATCH] emacs: make 'git-status' work with separate git dirs Enrico Scholz
2012-11-25 6:22 ` Junio C Hamano [this message]
2012-11-25 9:06 ` Alexandre Julliard
2012-11-26 23:30 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v4nkeyzfb.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=enrico.scholz@sigma-chemnitz.de \
--cc=git@vger.kernel.org \
--cc=julliard@winehq.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).