Sync with Git 2.17.1

diff --git a/builtin/update-index.c b/builtin/update-index.c
index 1af8a00b889c968634389bf61138200d97eb32f9..6598bc06ad29cfe1ad8c17fb21c476a8da8bf96a 100644 (file)
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -602,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;
@@ -1069,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: