Skip to content

Commit 146839c

Browse files
phillipwoodgitster
authored andcommitted
rebase: don't translate trace strings
commit b3a5d5a ("trace2:data: add subverb for rebase", 2019-02-22) mistakenly marked the subverb names for translation and unnecessarily NULL terminated the array. Signed-off-by: Phillip Wood <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent fc4a673 commit 146839c

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

builtin/rebase.c

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,14 +1027,13 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
10271027
ACTION_EDIT_TODO,
10281028
ACTION_SHOW_CURRENT_PATCH,
10291029
} action = NO_ACTION;
1030-
static const char *action_names[] = { N_("undefined"),
1031-
N_("continue"),
1032-
N_("skip"),
1033-
N_("abort"),
1034-
N_("quit"),
1035-
N_("edit_todo"),
1036-
N_("show_current_patch"),
1037-
NULL };
1030+
static const char *action_names[] = { "undefined",
1031+
"continue",
1032+
"skip",
1033+
"abort",
1034+
"quit",
1035+
"edit_todo",
1036+
"show_current_patch" };
10381037
const char *gpg_sign = NULL;
10391038
struct string_list exec = STRING_LIST_INIT_NODUP;
10401039
const char *rebase_merges = NULL;

0 commit comments

Comments
 (0)