diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-04-17 15:30:34 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-04-19 17:32:10 +0900 |
| commit | 146839c4b69ec47a356eb1156f2093ac5cc2cb60 (patch) | |
| tree | 80fe4dbde322c2e823df9fb915f44b39759b163a | |
| parent | sequencer: always discard index after checkout (diff) | |
| download | tgif-146839c4b69ec47a356eb1156f2093ac5cc2cb60.tar.xz | |
rebase: don't translate trace strings
commit b3a5d5a80c ("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 <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/rebase.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 52114cbf0d..239a54ecfe 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1027,14 +1027,13 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) ACTION_EDIT_TODO, ACTION_SHOW_CURRENT_PATCH, } action = NO_ACTION; - static const char *action_names[] = { N_("undefined"), - N_("continue"), - N_("skip"), - N_("abort"), - N_("quit"), - N_("edit_todo"), - N_("show_current_patch"), - NULL }; + static const char *action_names[] = { "undefined", + "continue", + "skip", + "abort", + "quit", + "edit_todo", + "show_current_patch" }; const char *gpg_sign = NULL; struct string_list exec = STRING_LIST_INIT_NODUP; const char *rebase_merges = NULL; |