From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lars Hjemli Subject: [PATCH 4/5] git-submodule: prepare for the .git-file Date: Mon, 18 Feb 2008 11:44:22 +0100 Message-ID: <1203331463-13857-5-git-send-email-hjemli@gmail.com> References: <1203331463-13857-1-git-send-email-hjemli@gmail.com> <1203331463-13857-2-git-send-email-hjemli@gmail.com> <1203331463-13857-3-git-send-email-hjemli@gmail.com> <1203331463-13857-4-git-send-email-hjemli@gmail.com> Cc: Junio C Hamano , Johannes Schindelin To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Feb 18 11:47:46 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1JR3Wn-00046J-ME for gcvg-git-2@gmane.org; Mon, 18 Feb 2008 11:47:18 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758943AbYBRKqn (ORCPT ); Mon, 18 Feb 2008 05:46:43 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758889AbYBRKqn (ORCPT ); Mon, 18 Feb 2008 05:46:43 -0500 Received: from mail45.e.nsc.no ([193.213.115.45]:52815 "EHLO mail45.e.nsc.no" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758399AbYBRKql (ORCPT ); Mon, 18 Feb 2008 05:46:41 -0500 Received: from localhost.localdomain (ti231210a341-0179.bb.online.no [88.88.168.179]) by mail45.nsc.no (8.13.8/8.13.5) with ESMTP id m1IAjYWM026988; Mon, 18 Feb 2008 11:45:38 +0100 (MET) X-Mailer: git-send-email 1.5.4.1.188.g3ea1f5 In-Reply-To: <1203331463-13857-4-git-send-email-hjemli@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: When git-submodule tries to detect 'active' submodules, it checks 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 --- git-submodule.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh index a6aaf40..e7c08b5 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -288,7 +288,7 @@ cmd_update() continue fi - if ! test -d "$path"/.git + if ! test -d "$path"/.git -o -f "$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 -d "$path"/.git -o -f "$path"/.git then say "-$sha1 $path" continue; -- 1.5.4.1.188.g3ea1f5