More topics for 2.8.4

diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c
index 3b913d1b3710f012117f5520755fdbc89c54c82f..92c69672e96f6e7fc6bbe7b783c551474224f18b 100644 (file)
--- a/builtin/checkout-index.c
+++ b/builtin/checkout-index.c
@@ -130,26 +130,6 @@ static const char * const builtin_checkout_index_usage[] = {
 
 static struct lock_file lock_file;
 
-static int option_parse_u(const struct option *opt,
-                             const char *arg, int unset)
-{
-       int *newfd = opt->value;
-
-       state.refresh_cache = 1;
-       state.istate = &the_index;
-       if (*newfd < 0)
-               *newfd = hold_locked_index(&lock_file, 1);
-       return 0;
-}
-
-static int option_parse_prefix(const struct option *opt,
-                              const char *arg, int unset)
-{
-       state.base_dir = arg;
-       state.base_dir_len = strlen(arg);
-       return 0;
-}
-
 static int option_parse_stage(const struct option *opt,
                              const char *arg, int unset)
 {
@@ -161,7 +141,7 @@ static int option_parse_stage(const struct option *opt,
                if ('1' <= ch && ch <= '3')
                        checkout_stage = arg[0] - '0';
                else
-                       die("stage should be between 1 and 3 or all");
+                       die(_("stage should be between 1 and 3 or all"));
        }
        return 0;
 }
@@ -174,6 +154,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
        int read_from_stdin = 0;
        int prefix_length;
        int force = 0, quiet = 0, not_new = 0;
+       int index_opt = 0;
        struct option builtin_checkout_index_options[] = {
                OPT_BOOL('a', "all", &all,
                        N_("check out all files in the index")),
@@ -182,21 +163,19 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
                        N_("no warning for existing files and files not in index")),
                OPT_BOOL('n', "no-create", &not_new,
                        N_("don't checkout new files")),
-               { OPTION_CALLBACK, 'u', "index", &newfd, NULL,
-                       N_("update stat information in the index file"),
-                       PARSE_OPT_NOARG, option_parse_u },
+               OPT_BOOL('u', "index", &index_opt,
+                        N_("update stat information in the index file")),
                OPT_BOOL('z', NULL, &nul_term_line,
                        N_("paths are separated with NUL character")),
                OPT_BOOL(0, "stdin", &read_from_stdin,
                        N_("read list of paths from the standard input")),
                OPT_BOOL(0, "temp", &to_tempfile,
                        N_("write the content to temporary files")),
-               OPT_CALLBACK(0, "prefix", NULL, N_("string"),
-                       N_("when creating files, prepend <string>"),
-                       option_parse_prefix),
-               OPT_CALLBACK(0, "stage", NULL, NULL,
+               OPT_STRING(0, "prefix", &state.base_dir, N_("string"),
+                       N_("when creating files, prepend <string>")),
+               { OPTION_CALLBACK, 0, "stage", NULL, "1-3|all",
                        N_("copy out the files from named stage"),
-                       option_parse_stage),
+                       PARSE_OPT_NONEG, option_parse_stage },
                OPT_END()
        };
 
@@ -204,7 +183,6 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
                usage_with_options(builtin_checkout_index_usage,
                                   builtin_checkout_index_options);
        git_config(git_default_config, NULL);
-       state.base_dir = "";
        prefix_length = prefix ? strlen(prefix) : 0;
 
        if (read_cache() < 0) {
@@ -217,15 +195,17 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
        state.quiet = quiet;
        state.not_new = not_new;
 
-       if (state.base_dir_len || to_tempfile) {
-               /* when --prefix is specified we do not
-                * want to update cache.
-                */
-               if (state.refresh_cache) {
-                       rollback_lock_file(&lock_file);
-                       newfd = -1;
-               }
-               state.refresh_cache = 0;
+       if (!state.base_dir)
+               state.base_dir = "";
+       state.base_dir_len = strlen(state.base_dir);
+
+       /*
+        * when --prefix is specified we do not want to update cache.
+        */
+       if (index_opt && !state.base_dir_len && !to_tempfile) {
+               state.refresh_cache = 1;
+               state.istate = &the_index;
+               newfd = hold_locked_index(&lock_file, 1);
        }
 
        /* Check out named files first */