mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-commit: remove lego in i18n messages

Browse Source 
Remove the whence_s() function and messages that depend on it, in favor of
messages that use either "merge" or "cherry-pick" directly.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2012-04-30 15:33:13 +00:00
committed by Junio C Hamano
parent c179837cfb
commit b0cea47e6c
1 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
builtin/commit.c
View File

@ -194,24 +194,6 @@ static void determine_whence(struct wt_status *s)
s->whence = whence; s->whence = whence;
} }
static const char *whence_s(void)
{
const char *s = "";
switch (whence) {
case FROM_COMMIT:
break;
case FROM_MERGE:
s = _("merge");
break;
case FROM_CHERRY_PICK:
s = _("cherry-pick");
break;
}
return s;
}
static void rollback_index_files(void) static void rollback_index_files(void)
{ {
switch (commit_style) { switch (commit_style) {
@ -453,8 +435,12 @@ static char *prepare_index(int argc, const char **argv, const char *prefix,
*/ */
commit_style = COMMIT_PARTIAL; commit_style = COMMIT_PARTIAL;
if (whence != FROM_COMMIT) if (whence != FROM_COMMIT) {
die(_("cannot do a partial commit during a %s."), whence_s()); if (whence == FROM_MERGE)
die(_("cannot do a partial commit during a merge."));
else if (whence == FROM_CHERRY_PICK)
die(_("cannot do a partial commit during a cherry-pick."));
}
memset(&partial, 0, sizeof(partial)); memset(&partial, 0, sizeof(partial));
partial.strdup_strings = 1; partial.strdup_strings = 1;
@ -796,13 +782,17 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
char *ai_tmp, *ci_tmp; char *ai_tmp, *ci_tmp;
if (whence != FROM_COMMIT) if (whence != FROM_COMMIT)
status_printf_ln(s, GIT_COLOR_NORMAL, status_printf_ln(s, GIT_COLOR_NORMAL,
_("\n" whence == FROM_MERGE
"It looks like you may be committing a %s.\n" ? _("\n"
"If this is not correct, please remove the file\n" "It looks like you may be committing a merge.\n"
" %s\n" "If this is not correct, please remove the file\n"
"and try again.\n" " %s\n"
""), "and try again.\n")
whence_s(), : _("\n"
"It looks like you may be committing a cherry-pick.\n"
"If this is not correct, please remove the file\n"
" %s\n"
"and try again.\n"),
git_path(whence == FROM_MERGE git_path(whence == FROM_MERGE
? "MERGE_HEAD" ? "MERGE_HEAD"
: "CHERRY_PICK_HEAD")); : "CHERRY_PICK_HEAD"));
@ -1072,8 +1062,12 @@ static int parse_and_validate_options(int argc, const char *argv[],
/* Sanity check options */ /* Sanity check options */
if (amend && !current_head) if (amend && !current_head)
die(_("You have nothing to amend.")); die(_("You have nothing to amend."));
if (amend && whence != FROM_COMMIT) if (amend && whence != FROM_COMMIT) {
die(_("You are in the middle of a %s -- cannot amend."), whence_s()); if (whence == FROM_MERGE)
die(_("You are in the middle of a merge -- cannot amend."));
else if (whence == FROM_CHERRY_PICK)
die(_("You are in the middle of a cherry-pick -- cannot amend."));
}
if (fixup_message && squash_message) if (fixup_message && squash_message)
die(_("Options --squash and --fixup cannot be used together")); die(_("Options --squash and --fixup cannot be used together"));
if (use_message) if (use_message)