kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

i18n: git-commit formatting messages 

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Ævar Arnfjörð Bjarmason 2011-02-22 23:41:46 +00:00 committed by Junio C Hamano
parent 9c227655b0
commit fe8165cd4f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/commit.c
View File

@ -695,12 +695,12 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
char *ai_tmp, *ci_tmp; char *ai_tmp, *ci_tmp;
if (in_merge) if (in_merge)
status_printf_ln(s, GIT_COLOR_NORMAL, status_printf_ln(s, GIT_COLOR_NORMAL,
"\n" _("\n"
"It looks like you may be committing a MERGE.\n" "It looks like you may be committing a MERGE.\n"
"If this is not correct, please remove the file\n" "If this is not correct, please remove the file\n"
" %s\n" " %s\n"
"and try again.\n" "and try again.\n"
"", ""),
git_path("MERGE_HEAD")); git_path("MERGE_HEAD"));


fprintf(s->fp, "\n"); fprintf(s->fp, "\n");
@ -725,15 +725,15 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
ci_tmp = cut_ident_timestamp_part(committer_ident.buf); ci_tmp = cut_ident_timestamp_part(committer_ident.buf);
if (strcmp(author_ident->buf, committer_ident.buf)) if (strcmp(author_ident->buf, committer_ident.buf))
status_printf_ln(s, GIT_COLOR_NORMAL, status_printf_ln(s, GIT_COLOR_NORMAL,
"%s" _("%s"
"Author: %s", "Author: %s"),
ident_shown++ ? "" : "\n", ident_shown++ ? "" : "\n",
author_ident->buf); author_ident->buf);


if (!user_ident_sufficiently_given()) if (!user_ident_sufficiently_given())
status_printf_ln(s, GIT_COLOR_NORMAL, status_printf_ln(s, GIT_COLOR_NORMAL,
"%s" _("%s"
"Committer: %s", "Committer: %s"),
ident_shown++ ? "" : "\n", ident_shown++ ? "" : "\n",
committer_ident.buf); committer_ident.buf);



4
t/t7502-commit.sh
View File

@ -234,7 +234,7 @@ echo "#
# Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> # Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
#" >> expect #" >> expect


test_expect_success 'author different from committer' ' test_expect_success C_LOCALE_OUTPUT 'author different from committer' '


echo >>negative && echo >>negative &&
git commit -e -m "sample" git commit -e -m "sample"
@ -248,7 +248,7 @@ rm -f expect.tmp
echo "# Committer: echo "# Committer:
#" >> expect #" >> expect


test_expect_success 'committer is automatic' ' test_expect_success C_LOCALE_OUTPUT 'committer is automatic' '


echo >>negative && echo >>negative &&
( (