зеркало из https://github.com/microsoft/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>
This commit is contained in:
Родитель
62a64d1a6b
Коммит
c4c66b2669
|
@ -614,7 +614,7 @@ sub cmd_create_ignore {
|
||||||
print GITIGNORE "$s\n";
|
print GITIGNORE "$s\n";
|
||||||
close(GITIGNORE)
|
close(GITIGNORE)
|
||||||
or fatal("Failed to close `$ignore': $!");
|
or fatal("Failed to close `$ignore': $!");
|
||||||
command_noisy('add', $ignore);
|
command_noisy('add', '-f', $ignore);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче