git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lars Hjemli <hjemli@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	"Shawn O. Pearce" <spearce@spearce.org>,
	git@vger.kernel.org
Subject: [PATCH 4/4] git-submodule: prepare for the .git-file
Date: Mon,  4 Feb 2008 21:59:21 +0100	[thread overview]
Message-ID: <1202158761-31211-5-git-send-email-hjemli@gmail.com> (raw)
In-Reply-To: <1202158761-31211-4-git-send-email-hjemli@gmail.com>

When git-submodule tried to detect 'active' submodules, it checked for the
existence of a directory named '.git'. This isn't good enough now that .git
can be a file pointing to the real $GIT_DIR so the tests are changed to
reflect this.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
 git-submodule.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-submodule.sh b/git-submodule.sh
index a6aaf40..220d64c 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -288,7 +288,7 @@ cmd_update()
 			continue
 		fi
 
-		if ! test -d "$path"/.git
+		if ! test -e "$path"/.git
 		then
 			module_clone "$path" "$url" || exit
 			subsha1=
@@ -362,7 +362,7 @@ cmd_status()
 	do
 		name=$(module_name "$path") || exit
 		url=$(git config submodule."$name".url)
-		if test -z "url" || ! test -d "$path"/.git
+		if test -z "url" || ! test -e "$path"/.git
 		then
 			say "-$sha1 $path"
 			continue;
-- 
1.5.4.5.g25d066

  reply	other threads:[~2008-02-04 21:02 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-04 20:59 [PATCH 0/4] Introduce the .git-file Lars Hjemli
2008-02-04 20:59 ` [PATCH 1/4] Add platform-independent .git "symlink" Lars Hjemli
2008-02-04 20:59   ` [PATCH 2/4] Document the .git-file Lars Hjemli
2008-02-04 20:59     ` [PATCH 3/4] Add tests for .git file Lars Hjemli
2008-02-04 20:59       ` Lars Hjemli [this message]
2008-02-04 22:23         ` [PATCH 4/4] git-submodule: prepare for the .git-file Mike Hommey
2008-02-04 22:44           ` Lars Hjemli
2008-02-06  3:25       ` [PATCH 3/4] Add tests for .git file Junio C Hamano
2008-02-06  7:56         ` [PATCH 3/4 v2] " Lars Hjemli
2008-02-06  8:40           ` Junio C Hamano
2008-02-06  9:30             ` Lars Hjemli
2008-02-06 10:13               ` Junio C Hamano
2008-02-06 10:35                 ` Lars Hjemli

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=1202158761-31211-5-git-send-email-hjemli@gmail.com \
    --to=hjemli@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=spearce@spearce.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).