development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-06 00:29:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

notes: spell first word of error messages in lowercase

Browse source 
That's the usual style.

Update one test to reflect these changes.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Vasco Almeida 2016-09-15 14:59:04 +00:00 committed by Junio C Hamano
parent 2d1252dade
commit 8d79589ad6
2 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
builtin/notes.c
View file

@ -191,7 +191,7 @@ static void prepare_note_data(const unsigned char *object, struct note_data *d,
strbuf_reset(&d->buf); strbuf_reset(&d->buf);
if (launch_editor(d->edit_path, &d->buf, NULL)) { if (launch_editor(d->edit_path, &d->buf, NULL)) {
die(_("Please supply the note contents using either -m or -F option")); die(_("please supply the note contents using either -m or -F option"));
} }
strbuf_stripspace(&d->buf, 1); strbuf_stripspace(&d->buf, 1);
} }
@ -202,7 +202,7 @@ static void write_note_data(struct note_data *d, unsigned char *sha1)
if (write_sha1_file(d->buf.buf, d->buf.len, blob_type, sha1)) { if (write_sha1_file(d->buf.buf, d->buf.len, blob_type, sha1)) {
error(_("unable to write note object")); error(_("unable to write note object"));
if (d->edit_path) if (d->edit_path)
error(_("The note contents have been left in %s"), error(_("the note contents have been left in %s"),
d->edit_path); d->edit_path);
exit(128); exit(128);
} }
@ -251,14 +251,14 @@ static int parse_reuse_arg(const struct option *opt, const char *arg, int unset)
strbuf_addch(&d->buf, '\n'); strbuf_addch(&d->buf, '\n');
if (get_sha1(arg, object)) if (get_sha1(arg, object))
die(_("Failed to resolve '%s' as a valid ref."), arg); die(_("failed to resolve '%s' as a valid ref."), arg);
if (!(buf = read_sha1_file(object, &type, &len))) { if (!(buf = read_sha1_file(object, &type, &len))) {
free(buf); free(buf);
die(_("Failed to read object '%s'."), arg); die(_("failed to read object '%s'."), arg);
} }
if (type != OBJ_BLOB) { if (type != OBJ_BLOB) {
free(buf); free(buf);
die(_("Cannot read note data from non-blob object '%s'."), arg); die(_("cannot read note data from non-blob object '%s'."), arg);
} }
strbuf_add(&d->buf, buf, len); strbuf_add(&d->buf, buf, len);
free(buf); free(buf);
@ -298,13 +298,13 @@ static int notes_copy_from_stdin(int force, const char *rewrite_cmd)
split = strbuf_split(&buf, ' '); split = strbuf_split(&buf, ' ');
if (!split[0] || !split[1]) if (!split[0] || !split[1])
die(_("Malformed input line: '%s'."), buf.buf); die(_("malformed input line: '%s'."), buf.buf);
strbuf_rtrim(split[0]); strbuf_rtrim(split[0]);
strbuf_rtrim(split[1]); strbuf_rtrim(split[1]);
if (get_sha1(split[0]->buf, from_obj)) if (get_sha1(split[0]->buf, from_obj))
die(_("Failed to resolve '%s' as a valid ref."), split[0]->buf); die(_("failed to resolve '%s' as a valid ref."), split[0]->buf);
if (get_sha1(split[1]->buf, to_obj)) if (get_sha1(split[1]->buf, to_obj))
die(_("Failed to resolve '%s' as a valid ref."), split[1]->buf); die(_("failed to resolve '%s' as a valid ref."), split[1]->buf);
if (rewrite_cmd) if (rewrite_cmd)
err = copy_note_for_rewrite(c, from_obj, to_obj); err = copy_note_for_rewrite(c, from_obj, to_obj);
@ -313,7 +313,7 @@ static int notes_copy_from_stdin(int force, const char *rewrite_cmd)
combine_notes_overwrite); combine_notes_overwrite);
if (err) { if (err) {
error(_("Failed to copy notes from '%s' to '%s'"), error(_("failed to copy notes from '%s' to '%s'"),
split[0]->buf, split[1]->buf); split[0]->buf, split[1]->buf);
ret = 1; ret = 1;
} }
@ -342,7 +342,7 @@ static struct notes_tree *init_notes_check(const char *subcommand,
if (!starts_with(ref, "refs/notes/")) if (!starts_with(ref, "refs/notes/"))
/* TRANSLATORS: the first %s will be replaced by a /* TRANSLATORS: the first %s will be replaced by a
git notes command: 'add', 'merge', 'remove', etc.*/ git notes command: 'add', 'merge', 'remove', etc.*/
die(_("Refusing to %s notes in %s (outside of refs/notes/)"), die(_("refusing to %s notes in %s (outside of refs/notes/)"),
subcommand, ref); subcommand, ref);
return t; return t;
} }
@ -369,13 +369,13 @@ static int list(int argc, const char **argv, const char *prefix)
t = init_notes_check("list", 0); t = init_notes_check("list", 0);
if (argc) { if (argc) {
if (get_sha1(argv[0], object)) if (get_sha1(argv[0], object))
die(_("Failed to resolve '%s' as a valid ref."), argv[0]); die(_("failed to resolve '%s' as a valid ref."), argv[0]);
note = get_note(t, object); note = get_note(t, object);
if (note) { if (note) {
puts(sha1_to_hex(note)); puts(sha1_to_hex(note));
retval = 0; retval = 0;
} else } else
retval = error(_("No note found for object %s."), retval = error(_("no note found for object %s."),
sha1_to_hex(object)); sha1_to_hex(object));
} else } else
retval = for_each_note(t, 0, list_each_note, NULL); retval = for_each_note(t, 0, list_each_note, NULL);
@ -424,7 +424,7 @@ static int add(int argc, const char **argv, const char *prefix)
object_ref = argc > 1 ? argv[1] : "HEAD"; object_ref = argc > 1 ? argv[1] : "HEAD";
if (get_sha1(object_ref, object)) if (get_sha1(object_ref, object))
die(_("Failed to resolve '%s' as a valid ref."), object_ref); die(_("failed to resolve '%s' as a valid ref."), object_ref);
t = init_notes_check("add", NOTES_INIT_WRITABLE); t = init_notes_check("add", NOTES_INIT_WRITABLE);
note = get_note(t, object); note = get_note(t, object);
@ -510,12 +510,12 @@ static int copy(int argc, const char **argv, const char *prefix)
} }
if (get_sha1(argv[0], from_obj)) if (get_sha1(argv[0], from_obj))
die(_("Failed to resolve '%s' as a valid ref."), argv[0]); die(_("failed to resolve '%s' as a valid ref."), argv[0]);
object_ref = 1 < argc ? argv[1] : "HEAD"; object_ref = 1 < argc ? argv[1] : "HEAD";
if (get_sha1(object_ref, object)) if (get_sha1(object_ref, object))
die(_("Failed to resolve '%s' as a valid ref."), object_ref); die(_("failed to resolve '%s' as a valid ref."), object_ref);
t = init_notes_check("copy", NOTES_INIT_WRITABLE); t = init_notes_check("copy", NOTES_INIT_WRITABLE);
note = get_note(t, object); note = get_note(t, object);
@ -534,7 +534,7 @@ static int copy(int argc, const char **argv, const char *prefix)
from_note = get_note(t, from_obj); from_note = get_note(t, from_obj);
if (!from_note) { if (!from_note) {
retval = error(_("Missing notes on source object %s. Cannot " retval = error(_("missing notes on source object %s. Cannot "
"copy."), sha1_to_hex(from_obj)); "copy."), sha1_to_hex(from_obj));
goto out; goto out;
} }
@ -593,7 +593,7 @@ static int append_edit(int argc, const char **argv, const char *prefix)
object_ref = 1 < argc ? argv[1] : "HEAD"; object_ref = 1 < argc ? argv[1] : "HEAD";
if (get_sha1(object_ref, object)) if (get_sha1(object_ref, object))
die(_("Failed to resolve '%s' as a valid ref."), object_ref); die(_("failed to resolve '%s' as a valid ref."), object_ref);
t = init_notes_check(argv[0], NOTES_INIT_WRITABLE); t = init_notes_check(argv[0], NOTES_INIT_WRITABLE);
note = get_note(t, object); note = get_note(t, object);
@ -656,13 +656,13 @@ static int show(int argc, const char **argv, const char *prefix)
object_ref = argc ? argv[0] : "HEAD"; object_ref = argc ? argv[0] : "HEAD";
if (get_sha1(object_ref, object)) if (get_sha1(object_ref, object))
die(_("Failed to resolve '%s' as a valid ref."), object_ref); die(_("failed to resolve '%s' as a valid ref."), object_ref);
t = init_notes_check("show", 0); t = init_notes_check("show", 0);
note = get_note(t, object); note = get_note(t, object);
if (!note) if (!note)
retval = error(_("No note found for object %s."), retval = error(_("no note found for object %s."),
sha1_to_hex(object)); sha1_to_hex(object));
else { else {
const char *show_args[3] = {"show", sha1_to_hex(note), NULL}; const char *show_args[3] = {"show", sha1_to_hex(note), NULL};
@ -682,11 +682,11 @@ static int merge_abort(struct notes_merge_options *o)
*/ */
if (delete_ref("NOTES_MERGE_PARTIAL", NULL, 0)) if (delete_ref("NOTES_MERGE_PARTIAL", NULL, 0))
ret += error(_("Failed to delete ref NOTES_MERGE_PARTIAL")); ret += error(_("failed to delete ref NOTES_MERGE_PARTIAL"));
if (delete_ref("NOTES_MERGE_REF", NULL, REF_NODEREF)) if (delete_ref("NOTES_MERGE_REF", NULL, REF_NODEREF))
ret += error(_("Failed to delete ref NOTES_MERGE_REF")); ret += error(_("failed to delete ref NOTES_MERGE_REF"));
if (notes_merge_abort(o)) if (notes_merge_abort(o))
ret += error(_("Failed to remove 'git notes merge' worktree")); ret += error(_("failed to remove 'git notes merge' worktree"));
return ret; return ret;
} }
@ -706,11 +706,11 @@ static int merge_commit(struct notes_merge_options *o)
*/ */
if (get_sha1("NOTES_MERGE_PARTIAL", sha1)) if (get_sha1("NOTES_MERGE_PARTIAL", sha1))
die(_("Failed to read ref NOTES_MERGE_PARTIAL")); die(_("failed to read ref NOTES_MERGE_PARTIAL"));
else if (!(partial = lookup_commit_reference(sha1))) else if (!(partial = lookup_commit_reference(sha1)))
die(_("Could not find commit from NOTES_MERGE_PARTIAL.")); die(_("could not find commit from NOTES_MERGE_PARTIAL."));
else if (parse_commit(partial)) else if (parse_commit(partial))
die(_("Could not parse commit from NOTES_MERGE_PARTIAL.")); die(_("could not parse commit from NOTES_MERGE_PARTIAL."));
if (partial->parents) if (partial->parents)
hashcpy(parent_sha1, partial->parents->item->object.oid.hash); hashcpy(parent_sha1, partial->parents->item->object.oid.hash);
@ -723,10 +723,10 @@ static int merge_commit(struct notes_merge_options *o)
o->local_ref = local_ref_to_free = o->local_ref = local_ref_to_free =
resolve_refdup("NOTES_MERGE_REF", 0, sha1, NULL); resolve_refdup("NOTES_MERGE_REF", 0, sha1, NULL);
if (!o->local_ref) if (!o->local_ref)
die(_("Failed to resolve NOTES_MERGE_REF")); die(_("failed to resolve NOTES_MERGE_REF"));
if (notes_merge_commit(o, t, partial, sha1)) if (notes_merge_commit(o, t, partial, sha1))
die(_("Failed to finalize notes merge")); die(_("failed to finalize notes merge"));
/* Reuse existing commit message in reflog message */ /* Reuse existing commit message in reflog message */
memset(&pretty_ctx, 0, sizeof(pretty_ctx)); memset(&pretty_ctx, 0, sizeof(pretty_ctx));
@ -796,7 +796,7 @@ static int merge(int argc, const char **argv, const char *prefix)
} }
if (do_merge && argc != 1) { if (do_merge && argc != 1) {
error(_("Must specify a notes ref to merge")); error(_("must specify a notes ref to merge"));
usage_with_options(git_notes_merge_usage, options); usage_with_options(git_notes_merge_usage, options);
} else if (!do_merge && argc) { } else if (!do_merge && argc) {
error(_("too many parameters")); error(_("too many parameters"));
@ -820,7 +820,7 @@ static int merge(int argc, const char **argv, const char *prefix)
if (strategy) { if (strategy) {
if (parse_notes_merge_strategy(strategy, &o.strategy)) { if (parse_notes_merge_strategy(strategy, &o.strategy)) {
error(_("Unknown -s/--strategy: %s"), strategy); error(_("unknown -s/--strategy: %s"), strategy);
usage_with_options(git_notes_merge_usage, options); usage_with_options(git_notes_merge_usage, options);
} }
} else { } else {
@ -857,10 +857,10 @@ static int merge(int argc, const char **argv, const char *prefix)
/* Store ref-to-be-updated into .git/NOTES_MERGE_REF */ /* Store ref-to-be-updated into .git/NOTES_MERGE_REF */
wt = find_shared_symref("NOTES_MERGE_REF", default_notes_ref()); wt = find_shared_symref("NOTES_MERGE_REF", default_notes_ref());
if (wt) if (wt)
die(_("A notes merge into %s is already in-progress at %s"), die(_("a notes merge into %s is already in-progress at %s"),
default_notes_ref(), wt->path); default_notes_ref(), wt->path);
if (create_symref("NOTES_MERGE_REF", default_notes_ref(), NULL)) if (create_symref("NOTES_MERGE_REF", default_notes_ref(), NULL))
die(_("Failed to store link to current notes ref (%s)"), die(_("failed to store link to current notes ref (%s)"),
default_notes_ref()); default_notes_ref());
printf(_("Automatic notes merge failed. Fix conflicts in %s and " printf(_("Automatic notes merge failed. Fix conflicts in %s and "
"commit the result with 'git notes merge --commit', or " "commit the result with 'git notes merge --commit', or "
@ -1016,7 +1016,7 @@ int cmd_notes(int argc, const char **argv, const char *prefix)
else if (!strcmp(argv[0], "get-ref")) else if (!strcmp(argv[0], "get-ref"))
result = get_ref(argc, argv, prefix); result = get_ref(argc, argv, prefix);
else { else {
result = error(_("Unknown subcommand: %s"), argv[0]); result = error(_("unknown subcommand: %s"), argv[0]);
usage_with_options(git_notes_usage, options); usage_with_options(git_notes_usage, options);
} }

2
t/t3320-notes-merge-worktrees.sh
View file

@ -52,7 +52,7 @@ test_expect_success 'merge z into y while mid-merge in another workdir fails' '
cd worktree && cd worktree &&
git config core.notesRef refs/notes/y && git config core.notesRef refs/notes/y &&
test_must_fail git notes merge z 2>err && test_must_fail git notes merge z 2>err &&
test_i18ngrep "A notes merge into refs/notes/y is already in-progress at" err test_i18ngrep "a notes merge into refs/notes/y is already in-progress at" err
) && ) &&
test_path_is_missing .git/worktrees/worktree/NOTES_MERGE_REF test_path_is_missing .git/worktrees/worktree/NOTES_MERGE_REF
' '