aboutsummaryrefslogtreecommitdiffstats
path: root/sequencer.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-11-23 11:22:24 +0900
committerJunio C Hamano <gitster@pobox.com>2022-11-23 11:22:24 +0900
commitff84d031a9d819da99707010e289a46eb8f661f3 (patch)
tree07dea36adaf1c2e56dbb862171c3ed42058dc02a /sequencer.h
parent4a04f718c028d66f1212f74638b301a1a2653fdb (diff)
parent0e34efb31d89a143e42788f26f07e2bf8776a851 (diff)
downloadgit-ff84d031a9d819da99707010e289a46eb8f661f3.tar.gz
Merge branch 'pw/rebase-no-reflog-action'
Avoid setting GIT_REFLOG_ACTION to improve readability of the sequencer internals. * pw/rebase-no-reflog-action: rebase: stop exporting GIT_REFLOG_ACTION sequencer: stop exporting GIT_REFLOG_ACTION
Diffstat (limited to 'sequencer.h')
-rw-r--r--sequencer.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/sequencer.h b/sequencer.h
index 563fe59933..888c18aad7 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -63,6 +63,9 @@ struct replay_opts {
char **xopts;
size_t xopts_nr, xopts_alloc;
+ /* Reflog */
+ char *reflog_action;
+
/* Used by fixup/squash */
struct strbuf current_fixups;
int current_fixup_count;
@@ -73,6 +76,9 @@ struct replay_opts {
/* Only used by REPLAY_NONE */
struct rev_info *revs;
+
+ /* Private use */
+ const char *reflog_message;
};
#define REPLAY_OPTS_INIT { .edit = -1, .action = -1, .current_fixups = STRBUF_INIT }