From: "Daniel Graña" <dangra@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, "Daniel Graña" <dangra@gmail.com>
Subject: [PATCH] Improve tests for detached worktree in git-submodule
Date: Mon, 30 Jul 2012 14:51:59 -0300 [thread overview]
Message-ID: <1343670719-3635-1-git-send-email-dangra@gmail.com> (raw)
In-Reply-To: <7vsjc9qh33.fsf@alter.siamese.dyndns.org>
* Check submodule is correctly initialized and updated after cloning .dotfiles
Signed-off-by: Daniel Graña <dangra@gmail.com>
---
t/t7409-submodule-detached-worktree.sh | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/t/t7409-submodule-detached-worktree.sh b/t/t7409-submodule-detached-worktree.sh
index db75642..f82a757 100755
--- a/t/t7409-submodule-detached-worktree.sh
+++ b/t/t7409-submodule-detached-worktree.sh
@@ -15,7 +15,11 @@ TEST_NO_CREATE_REPO=1
test_expect_success 'submodule on detached working tree' '
git init --bare remote &&
test_create_repo bundle1 &&
- (cd bundle1 && test_commit "shoot") &&
+ (
+ cd bundle1 &&
+ test_commit "shoot" &&
+ git rev-parse --verify HEAD >../expect
+ ) &&
mkdir home &&
(
cd home &&
@@ -23,14 +27,27 @@ test_expect_success 'submodule on detached working tree' '
git clone --bare ../remote .dotfiles &&
git submodule add ../bundle1 .vim/bundle/sogood &&
test_commit "sogood" &&
+ (
+ unset GIT_WORK_TREE GIT_DIR &&
+ cd .vim/bundle/sogood &&
+ git rev-parse --verify HEAD >actual &&
+ test_cmp ../../../../expect actual
+ ) &&
git push origin master
- ) &&
+ )
mkdir home2 &&
(
cd home2 &&
- export GIT_WORK_TREE="$(pwd)" GIT_DIR="$(pwd)/.dotfiles" &&
git clone --bare ../remote .dotfiles &&
- git submodule update --init
+ export GIT_WORK_TREE="$(pwd)" GIT_DIR="$(pwd)/.dotfiles" &&
+ git checkout master &&
+ git submodule update --init &&
+ (
+ unset GIT_WORK_TREE GIT_DIR &&
+ cd .vim/bundle/sogood &&
+ git rev-parse --verify HEAD >actual &&
+ test_cmp ../../../../expect actual
+ )
)
'
@@ -42,6 +59,7 @@ test_expect_success 'submodule on detached working pointed by core.worktree' '
git clone --bare ../remote "$GIT_DIR" &&
git config core.bare false &&
git config core.worktree .. &&
+ git checkout master &&
git submodule add ../bundle1 .vim/bundle/dupe &&
test_commit "dupe" &&
git push origin master
@@ -52,9 +70,8 @@ test_expect_success 'submodule on detached working pointed by core.worktree' '
git config core.bare false &&
git config core.worktree .. &&
git pull &&
- git submodule update &&
- git submodule status &&
- test -d .vim/bundle/dupe
+ git submodule update --init &&
+ test -e .vim/bundle/dupe/shoot.t
)
'
--
1.7.5.4
next prev parent reply other threads:[~2012-07-30 17:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-30 16:10 [PATCH] Improve tests for detached worktree in git-submodule Daniel Graña
2012-07-30 16:39 ` Jeff King
[not found] ` <CAHCkQtNyNGBm8Z8FP7BybVOW0zQNgpxjwW_akLepYfLc-U+0cg@mail.gmail.com>
2012-07-30 17:06 ` Fwd: " Daniel Graña
2012-07-30 17:02 ` Junio C Hamano
2012-07-30 17:18 ` Daniel Graña
2012-07-30 17:44 ` Junio C Hamano
2012-07-30 17:51 ` Junio C Hamano
2012-07-30 17:51 ` Daniel Graña [this message]
2012-07-30 18:09 ` Junio C Hamano
2012-07-30 18:15 ` Daniel Graña
2012-07-30 17:43 ` Daniel Graña
2012-07-30 17:50 ` Daniel Graña
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1343670719-3635-1-git-send-email-dangra@gmail.com \
--to=dangra@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).