undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ja/i18n-cleanup'

Browse Source 
* ja/i18n-cleanup:
  i18n: read-cache: typofix
  i18n: remove i18n from tag reflog message
This commit is contained in:
Junio C Hamano 2017-05-04 16:26:44 +09:00
commit fa675ebd99
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/tag.c
View File

@ -309,7 +309,7 @@ static void create_reflog_msg(const unsigned char *sha1, struct strbuf *sb)
if (rla) { if (rla) {
strbuf_addstr(sb, rla); strbuf_addstr(sb, rla);
} else { } else {
strbuf_addstr(sb, _("tag: tagging ")); strbuf_addstr(sb, "tag: tagging ");
strbuf_add_unique_abbrev(sb, sha1, DEFAULT_ABBREV); strbuf_add_unique_abbrev(sb, sha1, DEFAULT_ABBREV);
} }
@ -317,14 +317,14 @@ static void create_reflog_msg(const unsigned char *sha1, struct strbuf *sb)
type = sha1_object_info(sha1, NULL); type = sha1_object_info(sha1, NULL);
switch (type) { switch (type) {
default: default:
strbuf_addstr(sb, _("object of unknown type")); strbuf_addstr(sb, "object of unknown type");
break; break;
case OBJ_COMMIT: case OBJ_COMMIT:
if ((buf = read_sha1_file(sha1, &type, &size)) != NULL) { if ((buf = read_sha1_file(sha1, &type, &size)) != NULL) {
subject_len = find_commit_subject(buf, &subject_start); subject_len = find_commit_subject(buf, &subject_start);
strbuf_insert(sb, sb->len, subject_start, subject_len); strbuf_insert(sb, sb->len, subject_start, subject_len);
} else { } else {
strbuf_addstr(sb, _("commit object")); strbuf_addstr(sb, "commit object");
} }
free(buf); free(buf);
@ -332,13 +332,13 @@ static void create_reflog_msg(const unsigned char *sha1, struct strbuf *sb)
strbuf_addf(sb, ", %s", show_date(c->date, 0, DATE_MODE(SHORT))); strbuf_addf(sb, ", %s", show_date(c->date, 0, DATE_MODE(SHORT)));
break; break;
case OBJ_TREE: case OBJ_TREE:
strbuf_addstr(sb, _("tree object")); strbuf_addstr(sb, "tree object");
break; break;
case OBJ_BLOB: case OBJ_BLOB:
strbuf_addstr(sb, _("blob object")); strbuf_addstr(sb, "blob object");
break; break;
case OBJ_TAG: case OBJ_TAG:
strbuf_addstr(sb, _("other tag object")); strbuf_addstr(sb, "other tag object");
break; break;
} }
strbuf_addch(sb, ')'); strbuf_addch(sb, ')');

2
read-cache.c
View File

@ -2372,7 +2372,7 @@ static int should_delete_shared_index(const char *shared_index_path)
if (!expiration) if (!expiration)
return 0; return 0;
if (stat(shared_index_path, &st)) if (stat(shared_index_path, &st))
return error_errno(_("could not stat '%s"), shared_index_path); return error_errno(_("could not stat '%s'"), shared_index_path);
if (st.st_mtime > expiration) if (st.st_mtime > expiration)
return 0; return 0;