[PATCH] git-cvsimport: perform initial checkout correctly

Junio C Hamano· Mar 18, 2007, 09:16 UTC · lore

Often people wonder why cvsimport does not perform the initial checkout even though -i option is not given.

---
 git-cvsimport.perl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to git-cvsimport.perl +1 −1

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 1a1ba7b..e269e26 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -1017,7 +1017,7 @@ if ($orig_branch) {
 		unless -f "$git_dir/refs/heads/master";
 	system('git-update-ref', 'HEAD', "$orig_branch");
 	unless ($opt_i) {
-		system('git checkout');
+		system('git checkout -f));
 		die "checkout failed: $?\n" if $?;
 	}
 }

patchgit-cvsimport: perform initial checkout correctly