Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
trace2:data: add subverb for rebase
author
Jeff Hostetler
<jeffhost@microsoft.com>
Fri, 22 Feb 2019 22:25:10 +0000
(14:25 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 22 Feb 2019 23:28:21 +0000
(15:28 -0800)
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/rebase.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
c18b6c1
)
diff --git
a/builtin/rebase.c
b/builtin/rebase.c
index 7c7bc13e912aa8ba5d2c4dfa781fb74cd20ac6d4..52114cbf0d9f98d52a5b48d8806019d14b1c7029 100644
(file)
--- a/
builtin/rebase.c
+++ b/
builtin/rebase.c
@@
-1027,6
+1027,14
@@
int cmd_rebase(int argc, const char **argv, const char *prefix)
ACTION_EDIT_TODO,
ACTION_SHOW_CURRENT_PATCH,
} action = NO_ACTION;
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 };
const char *gpg_sign = NULL;
struct string_list exec = STRING_LIST_INIT_NODUP;
const char *rebase_merges = NULL;
const char *gpg_sign = NULL;
struct string_list exec = STRING_LIST_INIT_NODUP;
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 "
"interactive rebase."));
die(_("The --edit-todo action can only be used during "
"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) {
case ACTION_CONTINUE: {
struct object_id head;
switch (action) {
case ACTION_CONTINUE: {
struct object_id head;