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 4/4] apply: add t4137 for submodule updates
Date: Tue, 25 Mar 2014 18:06:01 +0100 [thread overview]
Message-ID: <5331B779.3050306@web.de> (raw)
In-Reply-To: <5331B6F6.60501@web.de>
Test that the apply command updates the work tree as expected for the
'--index' and the '--3way' options (for submodule changes which don't
result in conflicts).
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
---
And this shows how to use the new framework when more than a single command
is needed to switch to a new work tree.
t/t4137-apply-submodule.sh | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100755 t/t4137-apply-submodule.sh
diff --git a/t/t4137-apply-submodule.sh b/t/t4137-apply-submodule.sh
new file mode 100755
index 0000000..f0a0500
--- /dev/null
+++ b/t/t4137-apply-submodule.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+test_description='git am handling submodules'
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-submodule-update.sh
+
+apply_index () {
+ git diff --ignore-submodules=dirty "..$1" | git apply --index -
+}
+
+test_submodule_switch "apply_index"
+
+apply_3way () {
+ git diff --ignore-submodules=dirty "..$1" | git apply --3way -
+}
+
+test_submodule_switch "apply_3way"
+
+test_done
--
1.9.1.327.g3d8d896
prev parent reply other threads:[~2014-03-25 17:06 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 ` [RFC/PATCH 3/4] checkout: call the new submodule update test framework Jens Lehmann
2014-03-25 17:06 ` Jens Lehmann [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=5331B779.3050306@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 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).