From 5092b0eb41426803022338c9f9709b2119da93e9 Mon Sep 17 00:00:00 2001 From: Raja R Harinath Date: Mon, 21 Jun 2010 19:08:23 +0530 Subject: Add --force to 'git fast-import' command-line Now that we support arbitrarily reseating branches, the branch can be reset to older SVN revisions or derive from a different branch point. The "only fast-forward" rule of git branch imports gets in our way. Note that the application of the rule is fairly unpredictable since the checking happens only at 'checkpoint's. Let's trust our handling of SVN history and override the sanity-check. Note that we don't lose any information since reseated branches are snapshotted before reset. --- src/repository.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/repository.cpp b/src/repository.cpp index d0e1a60..e31cf23 100644 --- a/src/repository.cpp +++ b/src/repository.cpp @@ -301,7 +301,7 @@ void Repository::startFastImport() fastImport.setProcessChannelMode(QProcess::MergedChannels); if (!CommandLineParser::instance()->contains("dry-run")) { - fastImport.start("git", QStringList() << "fast-import" << "--relative-marks" << "--import-marks=marks" << "--export-marks=marks"); + fastImport.start("git", QStringList() << "fast-import" << "--relative-marks" << "--import-marks=marks" << "--export-marks=marks" << "--force"); } else { fastImport.start("/bin/cat", QStringList()); } -- cgit v1.2.1