All of lore.kernel.org
 help / color / mirror / Atom feed
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 3/3] t9604: fixup for new cvsimport
Date: Sat, 12 Jan 2013 00:21:43 -0600	[thread overview]
Message-ID: <1357971703-28513-4-git-send-email-chris@rorvick.com> (raw)
In-Reply-To: <1357971703-28513-1-git-send-email-chris@rorvick.com>

cvsps no longer writes a cache file and therefore no longer can be told
to ignore it with -x.

Signed-off-by: Chris Rorvick <chris@rorvick.com>
---
 t/t9604-cvsimport-timestamps.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/t/t9604-cvsimport-timestamps.sh b/t/t9604-cvsimport-timestamps.sh
index 1fd5142..b1629b6 100755
--- a/t/t9604-cvsimport-timestamps.sh
+++ b/t/t9604-cvsimport-timestamps.sh
@@ -7,8 +7,7 @@ setup_cvs_test_repository t9604
 
 test_expect_success 'check timestamps are UTC (TZ=CST6CDT)' '
 
-	TZ=CST6CDT git cvsimport -p"-x" -C module-1 module &&
-	git cvsimport -p"-x" -C module-1 module &&
+	TZ=CST6CDT git cvsimport -C module-1 module &&
 	(
 		cd module-1 &&
 		git log --format="%s %ai"
@@ -42,7 +41,7 @@ test_expect_success 'check timestamps with author-specific timezones' '
 	user3=User Three <user3@domain.org> EST5EDT
 	user4=User Four <user4@domain.org> MST7MDT
 	EOF
-	git cvsimport -p"-x" -A cvs-authors -C module-2 module &&
+	git cvsimport -A cvs-authors -C module-2 module &&
 	(
 		cd module-2 &&
 		git log --format="%s %ai %an"
-- 
1.8.1.rc3.335.g88a67d6

  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 ` [PATCH v2 2/3] t9600: fixup for new cvsimport Chris Rorvick
2013-01-12  6:21 ` Chris Rorvick [this message]
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-4-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 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.