From: Gustaf Hendeby <hendeby@isy.liu.se>
Date: Sun, 4 May 2008 22:33:09 +0000 (+0200)
Subject: git-svn: Make create-ignore use git add -f
X-Git-Tag: v1.5.6-rc0~99
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c4c66b2669113dd7c36d660b5294066d8435bd0f;p=git.git

git-svn: Make create-ignore use git add -f

When having a svn:ignore that ignores the .gitignore file the -f
option to git add must be used to avoid git complaining about adding
an ignored file and hence stop the process of creating .gitignores.

Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-svn.perl b/git-svn.perl
index b70f8efaa..e47b1ea6c 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -614,7 +614,7 @@ sub cmd_create_ignore {
 		print GITIGNORE "$s\n";
 		close(GITIGNORE)
 		  or fatal("Failed to close `$ignore': $!");
-		command_noisy('add', $ignore);
+		command_noisy('add', '-f', $ignore);
 	});
 }