Permalink
Browse files

Add files even if they would be ignored by git

This would stop git from picking up additions that would be ignored by a
global gitignore file, leaving the repo in a confused state (the darcs
mirror has put changes the in the working dir, the git repo doesn't have
them, and git can't commit because it thinks the working dir is clean).
  • Loading branch information...
1 parent 5e8f292 commit 53f23cce0c2ef942e98dea971545ee4644234231 @jmah jmah committed Aug 29, 2009
Showing with 1 addition and 1 deletion.
  1. +1 −1 darcs-to-git
View
@@ -317,7 +317,7 @@ class DarcsPatch
run("git", "tag", "-a", "-m", git_commit_message, git_tag_name)
else
if (new_files = git_new_files).any?
- run(*(["git", "add"] + new_files))
+ run(*(["git", "add", "-f"] + new_files))
end
if git_changed_files.any? || new_files.any?
run("git", "commit", "-a", "-m", git_commit_message)

0 comments on commit 53f23cc

Please sign in to comment.