checkout & worktree: introduce checkout.defaultRemote

diff --git a/builtin/update-index.c b/builtin/update-index.c
index 52eaebae911ee3439f4464c9c317f1776f89c10a..a8709a26ec4b8bb79cbb20bfa4a7892e063c804d 100644 (file)
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -451,7 +451,8 @@ static void update_one(const char *path)
        int stat_errno = 0;
        struct stat st;
 
-       if (mark_valid_only || mark_skip_worktree_only || force_remove)
+       if (mark_valid_only || mark_skip_worktree_only || force_remove ||
+           mark_fsmonitor_only)
                st.st_mode = 0;
        else if (lstat(path, &st) < 0) {
                st.st_mode = 0;
@@ -601,7 +602,7 @@ static struct cache_entry *read_one_ent(const char *which,
        int size;
        struct cache_entry *ce;
 
-       if (get_tree_entry(ent->hash, path, oid.hash, &mode)) {
+       if (get_tree_entry(ent, path, &oid, &mode)) {
                if (which)
                        error("%s: not in %s branch.", path, which);
                return NULL;
@@ -1068,6 +1069,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
                        break;
                switch (parseopt_state) {
                case PARSE_OPT_HELP:
+               case PARSE_OPT_ERROR:
                        exit(129);
                case PARSE_OPT_NON_OPTION:
                case PARSE_OPT_DONE:
@@ -1172,7 +1174,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
                report(_("Untracked cache enabled for '%s'"), get_git_work_tree());
                break;
        default:
-               die("BUG: bad untracked_cache value: %d", untracked_cache);
+               BUG("bad untracked_cache value: %d", untracked_cache);
        }
 
        if (fsmonitor > 0) {