summaryrefslogtreecommitdiff
path: root/git-svn.perl
diff options
context:
space:
mode:
authorGustaf Hendeby <hendeby@isy.liu.se>2008-05-04 22:33:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-05-05 23:54:16 (GMT)
commitc4c66b2669113dd7c36d660b5294066d8435bd0f (patch)
tree17078a6cdcd1dc8437c337c58e75b319cefe77bb /git-svn.perl
parent62a64d1a6b8d1efad13f3f2e5310dc0e8f2f1dc7 (diff)
downloadgit-c4c66b2669113dd7c36d660b5294066d8435bd0f.zip
git-c4c66b2669113dd7c36d660b5294066d8435bd0f.tar.gz
git-c4c66b2669113dd7c36d660b5294066d8435bd0f.tar.bz2
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>
Diffstat (limited to 'git-svn.perl')
-rwxr-xr-xgit-svn.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl
index b70f8ef..e47b1ea 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);
});
}