microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

builtin/log: downcase the beginning of error messages 

Also drop full-stop at the end of error messages, per
Documentation/CodingGuidelines.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2019-02-22 10:24:07 -08:00
Родитель 35ee755a8c
Коммит bc208ae314
1 изменённых файлов: 20 добавлений и 20 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

40
builtin/log.c
Просмотреть файл

@ -513,7 +513,7 @@ static int show_blob_object(const struct object_id *oid, struct rev_info *rev, c
if (get_oid_with_context(the_repository, obj_name, if (get_oid_with_context(the_repository, obj_name,
GET_OID_RECORD_PATH, GET_OID_RECORD_PATH,
&oidc, &obj_context)) &oidc, &obj_context))
die(_("Not a valid object name %s"), obj_name); die(_("not a valid object name %s"), obj_name);
if (!obj_context.path || if (!obj_context.path ||
!textconv_object(the_repository, obj_context.path, !textconv_object(the_repository, obj_context.path,
obj_context.mode, &oidc, 1, &buf, &size)) { obj_context.mode, &oidc, 1, &buf, &size)) {
@ -537,7 +537,7 @@ static int show_tag_object(const struct object_id *oid, struct rev_info *rev)
int offset = 0; int offset = 0;
if (!buf) if (!buf)
return error(_("Could not read object %s"), oid_to_hex(oid)); return error(_("could not read object %s"), oid_to_hex(oid));
assert(type == OBJ_TAG); assert(type == OBJ_TAG);
while (offset < size && buf[offset] != '\n') { while (offset < size && buf[offset] != '\n') {
@ -631,7 +631,7 @@ int cmd_show(int argc, const char **argv, const char *prefix)
break; break;
o = parse_object(the_repository, &t->tagged->oid); o = parse_object(the_repository, &t->tagged->oid);
if (!o) if (!o)
ret = error(_("Could not read object %s"), ret = error(_("could not read object %s"),
oid_to_hex(&t->tagged->oid)); oid_to_hex(&t->tagged->oid));
objects[i].item = o; objects[i].item = o;
i--; i--;
@ -656,7 +656,7 @@ int cmd_show(int argc, const char **argv, const char *prefix)
ret = cmd_log_walk(&rev); ret = cmd_log_walk(&rev);
break; break;
default: default:
ret = error(_("Unknown type: %d"), o->type); ret = error(_("unknown type: %d"), o->type);
} }
} }
free(objects); free(objects);
@ -894,7 +894,7 @@ static int open_next_file(struct commit *commit, const char *subject,
printf("%s\n", filename.buf + outdir_offset); printf("%s\n", filename.buf + outdir_offset);
if ((rev->diffopt.file = fopen(filename.buf, "w")) == NULL) { if ((rev->diffopt.file = fopen(filename.buf, "w")) == NULL) {
error_errno(_("Cannot open patch file %s"), filename.buf); error_errno(_("cannot open patch file %s"), filename.buf);
strbuf_release(&filename); strbuf_release(&filename);
return -1; return -1;
} }
@ -911,7 +911,7 @@ static void get_patch_ids(struct rev_info *rev, struct patch_ids *ids)
unsigned flags1, flags2; unsigned flags1, flags2;
if (rev->pending.nr != 2) if (rev->pending.nr != 2)
die(_("Need exactly one range.")); die(_("need exactly one range"));
o1 = rev->pending.objects[0].item; o1 = rev->pending.objects[0].item;
o2 = rev->pending.objects[1].item; o2 = rev->pending.objects[1].item;
@ -921,7 +921,7 @@ static void get_patch_ids(struct rev_info *rev, struct patch_ids *ids)
c2 = lookup_commit_reference(the_repository, &o2->oid); c2 = lookup_commit_reference(the_repository, &o2->oid);
if ((flags1 & UNINTERESTING) == (flags2 & UNINTERESTING)) if ((flags1 & UNINTERESTING) == (flags2 & UNINTERESTING))
die(_("Not a range.")); die(_("not a range"));
init_patch_ids(the_repository, ids); init_patch_ids(the_repository, ids);
@ -1044,7 +1044,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
struct commit *head = list[0]; struct commit *head = list[0];
if (!cmit_fmt_is_mail(rev->commit_format)) if (!cmit_fmt_is_mail(rev->commit_format))
die(_("Cover letter needs email format")); die(_("cover letter needs email format"));
committer = git_committer_info(0); committer = git_committer_info(0);
@ -1214,7 +1214,7 @@ static int output_directory_callback(const struct option *opt, const char *arg,
const char **dir = (const char **)opt->value; const char **dir = (const char **)opt->value;
BUG_ON_OPT_NEG(unset); BUG_ON_OPT_NEG(unset);
if (*dir) if (*dir)
die(_("Two output directories?")); die(_("two output directories?"));
*dir = arg; *dir = arg;
return 0; return 0;
} }
@ -1321,7 +1321,7 @@ static struct commit *get_base_commit(const char *base_commit,
if (base_commit && strcmp(base_commit, "auto")) { if (base_commit && strcmp(base_commit, "auto")) {
base = lookup_commit_reference_by_name(base_commit); base = lookup_commit_reference_by_name(base_commit);
if (!base) if (!base)
die(_("Unknown commit %s"), base_commit); die(_("unknown commit %s"), base_commit);
} else if ((base_commit && !strcmp(base_commit, "auto")) || base_auto) { } else if ((base_commit && !strcmp(base_commit, "auto")) || base_auto) {
struct branch *curr_branch = branch_get(NULL); struct branch *curr_branch = branch_get(NULL);
const char *upstream = branch_get_upstream(curr_branch, NULL); const char *upstream = branch_get_upstream(curr_branch, NULL);
@ -1331,18 +1331,18 @@ static struct commit *get_base_commit(const char *base_commit,
struct object_id oid; struct object_id oid;
if (get_oid(upstream, &oid)) if (get_oid(upstream, &oid))
die(_("Failed to resolve '%s' as a valid ref."), upstream); die(_("failed to resolve '%s' as a valid ref"), upstream);
commit = lookup_commit_or_die(&oid, "upstream base"); commit = lookup_commit_or_die(&oid, "upstream base");
base_list = get_merge_bases_many(commit, total, list); base_list = get_merge_bases_many(commit, total, list);
/* There should be one and only one merge base. */ /* There should be one and only one merge base. */
if (!base_list || base_list->next) if (!base_list || base_list->next)
die(_("Could not find exact merge base.")); die(_("could not find exact merge base"));
base = base_list->item; base = base_list->item;
free_commit_list(base_list); free_commit_list(base_list);
} else { } else {
die(_("Failed to get upstream, if you want to record base commit automatically,\n" die(_("failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n" "please use git branch --set-upstream-to to track a remote branch.\n"
"Or you could specify base commit by --base=<base-commit-id> manually.")); "Or you could specify base commit by --base=<base-commit-id> manually"));
} }
} }
@ -1360,7 +1360,7 @@ static struct commit *get_base_commit(const char *base_commit,
struct commit_list *merge_base; struct commit_list *merge_base;
merge_base = get_merge_bases(rev[2 * i], rev[2 * i + 1]); merge_base = get_merge_bases(rev[2 * i], rev[2 * i + 1]);
if (!merge_base || merge_base->next) if (!merge_base || merge_base->next)
die(_("Failed to find exact merge base")); die(_("failed to find exact merge base"));
rev[i] = merge_base->item; rev[i] = merge_base->item;
} }
@ -1739,7 +1739,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
if (use_stdout) if (use_stdout)
die(_("standard output, or directory, which one?")); die(_("standard output, or directory, which one?"));
if (mkdir(output_directory, 0777) < 0 && errno != EEXIST) if (mkdir(output_directory, 0777) < 0 && errno != EEXIST)
die_errno(_("Could not create directory '%s'"), die_errno(_("could not create directory '%s'"),
output_directory); output_directory);
} }
@ -1941,7 +1941,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
if (!use_stdout && if (!use_stdout &&
open_next_file(rev.numbered_files ? NULL : commit, NULL, &rev, quiet)) open_next_file(rev.numbered_files ? NULL : commit, NULL, &rev, quiet))
die(_("Failed to create output files")); die(_("failed to create output files"));
shown = log_tree_commit(&rev, commit); shown = log_tree_commit(&rev, commit);
free_commit_buffer(the_repository->parsed_objects, free_commit_buffer(the_repository->parsed_objects,
commit); commit);
@ -2065,9 +2065,9 @@ int cmd_cherry(int argc, const char **argv, const char *prefix)
revs.max_parents = 1; revs.max_parents = 1;
if (add_pending_commit(head, &revs, 0)) if (add_pending_commit(head, &revs, 0))
die(_("Unknown commit %s"), head); die(_("unknown commit %s"), head);
if (add_pending_commit(upstream, &revs, UNINTERESTING)) if (add_pending_commit(upstream, &revs, UNINTERESTING))
die(_("Unknown commit %s"), upstream); die(_("unknown commit %s"), upstream);
/* Don't say anything if head and upstream are the same. */ /* Don't say anything if head and upstream are the same. */
if (revs.pending.nr == 2) { if (revs.pending.nr == 2) {
@ -2079,7 +2079,7 @@ int cmd_cherry(int argc, const char **argv, const char *prefix)
get_patch_ids(&revs, &ids); get_patch_ids(&revs, &ids);
if (limit && add_pending_commit(limit, &revs, UNINTERESTING)) if (limit && add_pending_commit(limit, &revs, UNINTERESTING))
die(_("Unknown commit %s"), limit); die(_("unknown commit %s"), limit);
/* reverse the list of commits */ /* reverse the list of commits */
if (prepare_revision_walk(&revs)) if (prepare_revision_walk(&revs))