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>,
	Sven Verdoolaege <skimo@kotnet.org>,
	git@vger.kernel.org
Subject: [PATCH 3/3] t7400: barf if git-submodule removes or replaces a file
Date: Sat,  9 Jun 2007 23:38:52 +0200	[thread overview]
Message-ID: <11814251333211-git-send-email-hjemli@gmail.com> (raw)
In-Reply-To: <1181425132239-git-send-email-hjemli@gmail.com>

The test for an unmolested file wouldn't fail properly if the file had been
removed or replaced by something other than a regular file. This fixes it.

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

diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 3940433..74fafce 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -72,7 +72,7 @@ test_expect_success 'update should fail when path is used by a file' '
 	then
 		echo "[OOPS] update should have failed"
 		false
-	elif test -f lib && test "$(cat lib)" != "hello"
+	elif test "$(cat lib)" != "hello"
 	then
 		echo "[OOPS] update failed but lib file was molested"
 		false
-- 
1.5.2.1.914.gbd3a7

      parent reply	other threads:[~2007-06-09 21:36 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-06-09 21:38 [PATCH 0/3] submodule improvements Lars Hjemli
2007-06-09 21:38 ` [PATCH 1/3] git-submodule: allow submodule name and path to differ Lars Hjemli
2007-06-10  0:27   ` Junio C Hamano
2007-06-10  7:25     ` Johannes Schindelin
2007-06-10  8:23       ` Junio C Hamano
2007-06-10  8:42         ` Lars Hjemli
2007-06-10  8:37     ` Lars Hjemli
2007-06-09 21:38 ` [PATCH 2/3] Add gitmodules(5) Lars Hjemli
2007-06-10  0:28   ` Frank Lichtenheld
2007-06-10  8:58     ` Lars Hjemli
2007-06-10  9:48       ` Johannes Schindelin
2007-06-10 10:10         ` Lars Hjemli
2007-06-10 12:12       ` Sven Verdoolaege
2007-06-10 12:30         ` Lars Hjemli
2007-06-10 12:40           ` Sven Verdoolaege
2007-06-10 12:51             ` Lars Hjemli
2007-06-10 20:57           ` Junio C Hamano
2007-06-10 21:14             ` Lars Hjemli
2007-06-11  8:34               ` Sven Verdoolaege
2007-06-11 10:47                 ` Lars Hjemli
2007-06-11 11:04                   ` Sven Verdoolaege
2007-06-11 16:17                     ` Junio C Hamano
2007-06-13 15:36   ` Matthias Lederhofer
2007-06-13 16:13     ` Lars Hjemli
2007-06-13 16:31       ` Matthias Lederhofer
2007-06-13 16:59         ` Lars Hjemli
2007-06-13 16:20     ` Junio C Hamano
2007-06-13 22:01       ` [PATCH] gitmodules(5): remove leading period from synopsis Lars Hjemli
2007-06-09 21:38 ` Lars Hjemli [this message]

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=11814251333211-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=skimo@kotnet.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).