i18n: factorize "--foo requires --bar" and the like

[thirdparty/git.git] / builtin / index-pack.c

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 15ae406e6b7e221f720070f3abbea951e2b914a9..3c2e6aee3cc67be5df9bc1b4b62f5cd8a5c26b86 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1486,7 +1486,7 @@ static void rename_tmp_packfile(const char **final_name,
                if (!*final_name)
                        *final_name = odb_pack_name(name, hash, ext);
                if (finalize_object_file(curr_name, *final_name))
-                       die(_("unable to rename temporary '*.%s' file to '%s"),
+                       die(_("unable to rename temporary '*.%s' file to '%s'"),
                            ext, *final_name);
        } else if (make_read_only_if_same) {
                chmod(*final_name, 0444);
@@ -1845,11 +1845,11 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
        if (!pack_name && !from_stdin)
                usage(index_pack_usage);
        if (fix_thin_pack && !from_stdin)
-               die(_("--fix-thin cannot be used without --stdin"));
+               die(_("the option '%s' requires '%s'"), "--fix-thin", "--stdin");
        if (from_stdin && !startup_info->have_repository)
                die(_("--stdin requires a git repository"));
        if (from_stdin && hash_algo)
-               die(_("--object-format cannot be used with --stdin"));
+               die(_("options '%s' and '%s' cannot be used together"), "--object-format", "--stdin");
        if (!index_name && pack_name)
                index_name = derive_filename(pack_name, "pack", "idx", &index_name_buf);