git-commit: remove lego in i18n messages
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>
Ævar Arnfjörð Bjarmason committed
Apr 30, 2012 at 15:33 UTC
b0cea47e6c19e8116df833ac5c466630f4b922ce
1 file changed
+23
-29
builtin/commit.c
+23
-29
@@ -194,24 +194,6 @@ static void determine_whence(struct wt_status *s)
194
s->whence = whence;
195
}
196
197
-static const char *whence_s(void)
198
-{
199
- const char *s = "";
200
-
201
- switch (whence) {
202
- case FROM_COMMIT:
203
- break;
204
- case FROM_MERGE:
205
- s = _("merge");
206
- break;
207
- case FROM_CHERRY_PICK:
208
- s = _("cherry-pick");
209
- break;
210
- }
211
-
212
- return s;
213
-}
214
-
197
static void rollback_index_files(void)
198
{
199
switch (commit_style) {
@@ -453,8 +435,12 @@ static char *prepare_index(int argc, const char **argv, const char *prefix,
435
*/
436
commit_style = COMMIT_PARTIAL;
437
456
- if (whence != FROM_COMMIT)
457
- die(_("cannot do a partial commit during a %s."), whence_s());
438
+ if (whence != FROM_COMMIT) {
439
+ if (whence == FROM_MERGE)
440
+ die(_("cannot do a partial commit during a merge."));
441
+ else if (whence == FROM_CHERRY_PICK)
442
+ die(_("cannot do a partial commit during a cherry-pick."));
443
+ }
444
445
memset(&partial, 0, sizeof(partial));
446
partial.strdup_strings = 1;
@@ -796,13 +782,17 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
782
char *ai_tmp, *ci_tmp;
783
if (whence != FROM_COMMIT)
784
status_printf_ln(s, GIT_COLOR_NORMAL,
799
- _("\n"
800
- "It looks like you may be committing a %s.\n"
801
- "If this is not correct, please remove the file\n"
802
- " %s\n"
803
- "and try again.\n"
804
- ""),
805
- whence_s(),
785
+ whence == FROM_MERGE
786
+ ? _("\n"
787
+ "It looks like you may be committing a merge.\n"
788
+ "If this is not correct, please remove the file\n"
789
+ " %s\n"
790
+ "and try again.\n")
791
+ : _("\n"
792
+ "It looks like you may be committing a cherry-pick.\n"
793
+ "If this is not correct, please remove the file\n"
794
+ " %s\n"
795
+ "and try again.\n"),
796
git_path(whence == FROM_MERGE
797
? "MERGE_HEAD"
798
: "CHERRY_PICK_HEAD"));
@@ -1072,8 +1062,12 @@ static int parse_and_validate_options(int argc, const char *argv[],
1062
/* Sanity check options */
1063
if (amend && !current_head)
1064
die(_("You have nothing to amend."));
1075
- if (amend && whence != FROM_COMMIT)
1076
- die(_("You are in the middle of a %s -- cannot amend."), whence_s());
1065
+ if (amend && whence != FROM_COMMIT) {
1066
+ if (whence == FROM_MERGE)
1067
+ die(_("You are in the middle of a merge -- cannot amend."));
1068
+ else if (whence == FROM_CHERRY_PICK)
1069
+ die(_("You are in the middle of a cherry-pick -- cannot amend."));
1070
+ }
1071
if (fixup_message && squash_message)
1072
die(_("Options --squash and --fixup cannot be used together"));
1073
if (use_message)