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@xxxxxxxxxxx> --- 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@xxxxxxxxxx> EST5EDT user4=User Four <user4@xxxxxxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html