remove_all_fetch_refspecs(): drop unused "remote" parameter

diff --git a/builtin/update-index.c b/builtin/update-index.c
index ff5cfd11948593984c791a0f922351343019f4cf..27db0928bf052b0c518bee57ffa7cdd6c03d5d85 100644 (file)
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -597,7 +597,7 @@ static struct cache_entry *read_one_ent(const char *which,
                                        struct object_id *ent, const char *path,
                                        int namelen, int stage)
 {
-       unsigned mode;
+       unsigned short mode;
        struct object_id oid;
        struct cache_entry *ce;
 
@@ -1081,6 +1081,8 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
        if (entries < 0)
                die("cache corrupted");
 
+       the_index.updated_skipworktree = 1;
+
        /*
         * Custom copy of parse_options() because we want to handle
         * filename arguments as they come.