Add clean.requireForce option, and add -f option to git-clean to override it

diff --git a/fast-import.c b/fast-import.c
index bea12151c29af7f4242baaf80e12fd26eb550a45..cdd629d6bc547609daabab6c1f3b73939fddb7b9 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -1312,7 +1312,7 @@ static int update_branch(struct branch *b)
 
                if (!in_merge_bases(old_cmit, &new_cmit, 1)) {
                        unlock_ref(lock);
-                       warn("Not updating %s"
+                       warning("Not updating %s"
                                " (new tip %s does not contain %s)",
                                b->name, sha1_to_hex(b->sha1), sha1_to_hex(old_sha1));
                        return -1;