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

diff --git a/hash-object.c b/hash-object.c
index 1e6f6bf7061d57bcfa194b3b7b3e45f6a3f7b54c..18f5017f51bcac5798e959991be37c7cd6d70528 100644 (file)
--- a/hash-object.c
+++ b/hash-object.c
@@ -15,7 +15,7 @@ static void hash_object(const char *path, enum object_type type, int write_objec
        fd = open(path, O_RDONLY);
        if (fd < 0 ||
            fstat(fd, &st) < 0 ||
-           index_fd(sha1, fd, &st, write_object, type))
+           index_fd(sha1, fd, &st, write_object, type, path))
                die(write_object
                    ? "Unable to add %s to database"
                    : "Unable to hash %s", path);