Merge branch 'en/ort-perf-batch-9'

[thirdparty/git.git] / builtin / notes.c

diff --git a/builtin/notes.c b/builtin/notes.c
index 2987c08a2e920d294f5a443d24381b6021c15fea..74bba39ca8293208d3d577a47e2617a11d856c20 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -373,7 +373,7 @@ static int list(int argc, const char **argv, const char *prefix)
                                     git_notes_list_usage, 0);
 
        if (1 < argc) {
-               error(_("too many parameters"));
+               error(_("too many arguments"));
                usage_with_options(git_notes_list_usage, options);
        }
 
@@ -428,7 +428,7 @@ static int add(int argc, const char **argv, const char *prefix)
                             PARSE_OPT_KEEP_ARGV0);
 
        if (2 < argc) {
-               error(_("too many parameters"));
+               error(_("too many arguments"));
                usage_with_options(git_notes_add_usage, options);
        }
 
@@ -506,7 +506,7 @@ static int copy(int argc, const char **argv, const char *prefix)
 
        if (from_stdin || rewrite_cmd) {
                if (argc) {
-                       error(_("too many parameters"));
+                       error(_("too many arguments"));
                        usage_with_options(git_notes_copy_usage, options);
                } else {
                        return notes_copy_from_stdin(force, rewrite_cmd);
@@ -514,11 +514,11 @@ static int copy(int argc, const char **argv, const char *prefix)
        }
 
        if (argc < 1) {
-               error(_("too few parameters"));
+               error(_("too few arguments"));
                usage_with_options(git_notes_copy_usage, options);
        }
        if (2 < argc) {
-               error(_("too many parameters"));
+               error(_("too many arguments"));
                usage_with_options(git_notes_copy_usage, options);
        }
 
@@ -595,7 +595,7 @@ static int append_edit(int argc, const char **argv, const char *prefix)
                             PARSE_OPT_KEEP_ARGV0);
 
        if (2 < argc) {
-               error(_("too many parameters"));
+               error(_("too many arguments"));
                usage_with_options(usage, options);
        }
 
@@ -662,7 +662,7 @@ static int show(int argc, const char **argv, const char *prefix)
                             0);
 
        if (1 < argc) {
-               error(_("too many parameters"));
+               error(_("too many arguments"));
                usage_with_options(git_notes_show_usage, options);
        }
 
@@ -730,7 +730,7 @@ static int merge_commit(struct notes_merge_options *o)
        else
                oidclr(&parent_oid);
 
-       t = xcalloc(1, sizeof(struct notes_tree));
+       CALLOC_ARRAY(t, 1);
        init_notes(t, "NOTES_MERGE_PARTIAL", combine_notes_overwrite, 0);
 
        o->local_ref = local_ref_to_free =
@@ -812,7 +812,7 @@ static int merge(int argc, const char **argv, const char *prefix)
                error(_("must specify a notes ref to merge"));
                usage_with_options(git_notes_merge_usage, options);
        } else if (!do_merge && argc) {
-               error(_("too many parameters"));
+               error(_("too many arguments"));
                usage_with_options(git_notes_merge_usage, options);
        }
 
@@ -960,7 +960,7 @@ static int prune(int argc, const char **argv, const char *prefix)
                             0);
 
        if (argc) {
-               error(_("too many parameters"));
+               error(_("too many arguments"));
                usage_with_options(git_notes_prune_usage, options);
        }
 
@@ -982,7 +982,7 @@ static int get_ref(int argc, const char **argv, const char *prefix)
                             git_notes_get_ref_usage, 0);
 
        if (argc) {
-               error(_("too many parameters"));
+               error(_("too many arguments"));
                usage_with_options(git_notes_get_ref_usage, options);
        }