undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trace2:data: add subverb for rebase

Browse Source 
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff Hostetler 2019-02-22 14:25:10 -08:00 committed by Junio C Hamano
parent c18b6c1a2b
commit b3a5d5a80c
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
builtin/rebase.c
View File

@ -1027,6 +1027,14 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
ACTION_EDIT_TODO, ACTION_EDIT_TODO,
ACTION_SHOW_CURRENT_PATCH, ACTION_SHOW_CURRENT_PATCH,
} action = NO_ACTION; } 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 };
const char *gpg_sign = NULL; const char *gpg_sign = NULL;
struct string_list exec = STRING_LIST_INIT_NODUP; struct string_list exec = STRING_LIST_INIT_NODUP;
const char *rebase_merges = NULL; const char *rebase_merges = NULL;
@ -1212,6 +1220,15 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
die(_("The --edit-todo action can only be used during " die(_("The --edit-todo action can only be used during "
"interactive rebase.")); "interactive rebase."));
if (trace2_is_enabled()) {
if (is_interactive(&options))
trace2_cmd_mode("interactive");
else if (exec.nr)
trace2_cmd_mode("interactive-exec");
else
trace2_cmd_mode(action_names[action]);
}
switch (action) { switch (action) {
case ACTION_CONTINUE: { case ACTION_CONTINUE: {
struct object_id head; struct object_id head;