From: Gerrit Pape <pape@smarden.org>
Date: Thu, 28 Jun 2007 11:12:07 +0000 (+0000)
Subject: git-cvsimport: force checkout of working tree after initial import
X-Git-Tag: v1.5.3-rc0~46
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7051c3b1294a110a862a7b48e983490fba32389f;p=git.git

git-cvsimport: force checkout of working tree after initial import

When creating a brand new git repository through git-cvsimport (not
incremental import), force a checkout of HEAD of master as working tree
after successful import using the -f switch to git checkout.  Otherwise
the working tree is empty, and all files are reported as 'deleted' by
git status.

This was noticed and reported by Cameron Dale through
 http://bugs.debian.org/430903

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 69ccb88dd..ba23eb8ee 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -1007,7 +1007,7 @@ if ($orig_branch) {
 		if ($opt_r && $opt_o ne 'HEAD');
 	system('git-update-ref', 'HEAD', "$orig_branch");
 	unless ($opt_i) {
-		system('git checkout');
+		system('git checkout -f');
 		die "checkout failed: $?\n" if $?;
 	}
 }