From: Jens Lehmann <Jens.Lehmann@web.de>
To: Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Jonathan Nieder p <jrnieder@gmail.com>, Jeff King <peff@peff.net>,
Heiko Voigt <hvoigt@hvoigt.net>
Subject: [RFC/PATCH 3/4] checkout: call the new submodule update test framework
Date: Tue, 25 Mar 2014 18:05:39 +0100 [thread overview]
Message-ID: <5331B763.10808@web.de> (raw)
In-Reply-To: <5331B6F6.60501@web.de>
Test that the checkout command updates the work tree as expected with or
without the '-f' flag.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
---
I think this should explain how to use the framework with a single command
and some options.
t/t2013-checkout-submodule.sh | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/t/t2013-checkout-submodule.sh b/t/t2013-checkout-submodule.sh
index 06b18f8..6847f75 100755
--- a/t/t2013-checkout-submodule.sh
+++ b/t/t2013-checkout-submodule.sh
@@ -3,6 +3,7 @@
test_description='checkout can handle submodules'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-submodule-update.sh
test_expect_success 'setup' '
mkdir submodule &&
@@ -62,4 +63,8 @@ test_expect_success '"checkout <submodule>" honors submodule.*.ignore from .git/
! test -s actual
'
+test_submodule_switch "git checkout"
+
+test_submodule_forced_switch "git checkout -f"
+
test_done
--
1.9.1.327.g3d8d896
next prev parent reply other threads:[~2014-03-25 17:05 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-25 17:03 [RFC/PATCH 0/4] Add submodule test harness Jens Lehmann
2014-03-25 17:04 ` [RFC/PATCH 1/4] test-lib: add test_dir_is_empty() Jens Lehmann
2014-03-25 20:49 ` Junio C Hamano
2014-03-25 21:06 ` David Kastrup
2014-03-26 8:29 ` Jens Lehmann
2014-03-26 10:43 ` Michael Haggerty
2014-03-26 19:22 ` Jens Lehmann
2014-03-25 17:05 ` [RFC/PATCH 2/4] Submodules: Add the lib-submodule-update.sh test library Jens Lehmann
2014-04-17 16:41 ` W. Trevor King
2014-04-17 19:23 ` Junio C Hamano
2014-04-17 21:30 ` Jens Lehmann
2014-04-18 12:39 ` Heiko Voigt
2014-04-17 21:08 ` Jens Lehmann
2014-04-17 21:55 ` W. Trevor King
2014-04-18 12:31 ` Jens Lehmann
2014-03-25 17:05 ` Jens Lehmann [this message]
2014-03-25 17:06 ` [RFC/PATCH 4/4] apply: add t4137 for submodule updates Jens Lehmann
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=5331B763.10808@web.de \
--to=jens.lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.