Skip to content

Commit a25314c

Browse files
charvi-077gitster
authored andcommitted
sequencer: fixup the datatype of the 'flag' argument
As 'flag' is a combination of bits, so change its datatype from 'enum todo_item_flags' to 'unsigned'. Mentored-by: Christian Couder <[email protected]> Mentored-by: Phillip Wood <[email protected]> Helped-by: Eric Sunshine <[email protected]> Signed-off-by: Charvi Mendiratta <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 2c0aa2c commit a25314c

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

sequencer.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1744,8 +1744,7 @@ static const char skip_first_commit_msg_str[] = N_("The 1st commit message will
17441744
static const char skip_nth_commit_msg_fmt[] = N_("The commit message #%d will be skipped:");
17451745
static const char combined_commit_msg_fmt[] = N_("This is a combination of %d commits.");
17461746

1747-
static int check_fixup_flag(enum todo_command command,
1748-
enum todo_item_flags flag)
1747+
static int check_fixup_flag(enum todo_command command, unsigned flag)
17491748
{
17501749
return command == TODO_FIXUP && ((flag & TODO_REPLACE_FIXUP_MSG) ||
17511750
(flag & TODO_EDIT_FIXUP_MSG));
@@ -1850,7 +1849,7 @@ static void update_squash_message_for_fixup(struct strbuf *msg)
18501849

18511850
static int append_squash_message(struct strbuf *buf, const char *body,
18521851
enum todo_command command, struct replay_opts *opts,
1853-
enum todo_item_flags flag)
1852+
unsigned flag)
18541853
{
18551854
const char *fixup_msg;
18561855
size_t commented_len = 0, fixup_off;
@@ -1906,7 +1905,7 @@ static int update_squash_messages(struct repository *r,
19061905
enum todo_command command,
19071906
struct commit *commit,
19081907
struct replay_opts *opts,
1909-
enum todo_item_flags flag)
1908+
unsigned flag)
19101909
{
19111910
struct strbuf buf = STRBUF_INIT;
19121911
int res = 0;

0 commit comments

Comments
 (0)