From: Chris Rorvick <chris@rorvick.com>
To: git@vger.kernel.org
Cc: "Eric S. Raymond" <esr@thyrsus.com>,
Junio C Hamano <gitster@pobox.com>,
Chris Rorvick <chris@rorvick.com>
Subject: [PATCH v2 2/3] t9600: fixup for new cvsimport
Date: Sat, 12 Jan 2013 00:21:42 -0600 [thread overview]
Message-ID: <1357971703-28513-3-git-send-email-chris@rorvick.com> (raw)
In-Reply-To: <1357971703-28513-1-git-send-email-chris@rorvick.com>
cvsimport no longer supports -a (import all commits including recent ones)
and no longer uses the 'origin' branch by default for imports.
Signed-off-by: Chris Rorvick <chris@rorvick.com>
---
t/t9600-cvsimport.sh | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
index 4c384ff..14f54d5 100755
--- a/t/t9600-cvsimport.sh
+++ b/t/t9600-cvsimport.sh
@@ -44,7 +44,7 @@ EOF
test_expect_success PERL 'import a trivial module' '
- git cvsimport -a -R -z 0 -C module-git module &&
+ git cvsimport -R -z 0 -C module-git module &&
test_cmp module-cvs/o_fortuna module-git/o_fortuna
'
@@ -90,8 +90,7 @@ test_expect_success PERL 'update git module' '
(cd module-git &&
git config cvsimport.trackRevisions true &&
- git cvsimport -a -z 0 module &&
- git merge origin
+ git cvsimport -z 0 module
) &&
test_cmp module-cvs/o_fortuna module-git/o_fortuna
@@ -119,8 +118,7 @@ test_expect_success PERL 'cvsimport.module config works' '
(cd module-git &&
git config cvsimport.module module &&
git config cvsimport.trackRevisions true &&
- git cvsimport -a -z0 &&
- git merge origin
+ git cvsimport -z0
) &&
test_cmp module-cvs/tick module-git/tick
@@ -140,7 +138,7 @@ test_expect_success PERL 'import from a CVS working tree' '
$CVS co -d import-from-wt module &&
(cd import-from-wt &&
git config cvsimport.trackRevisions false &&
- git cvsimport -a -z0 &&
+ git cvsimport -z0 &&
echo 1 >expect &&
git log -1 --pretty=format:%s%n >actual &&
test_cmp actual expect
--
1.8.1.rc3.335.g88a67d6
next prev parent reply other threads:[~2013-01-12 6:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-12 6:21 [PATCH v2 0/3] fixup remaining cvsimport tests Chris Rorvick
2013-01-12 6:21 ` [PATCH v2 1/3] t/lib-cvs.sh: allow cvsps version 3.x Chris Rorvick
2013-01-12 6:21 ` Chris Rorvick [this message]
2013-01-12 6:21 ` [PATCH v2 3/3] t9604: fixup for new cvsimport Chris Rorvick
2013-01-12 6:36 ` [PATCH v2 0/3] fixup remaining cvsimport tests Junio C Hamano
2013-01-12 7:01 ` Chris Rorvick
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=1357971703-28513-3-git-send-email-chris@rorvick.com \
--to=chris@rorvick.com \
--cc=esr@thyrsus.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.
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).