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

sequencer: fixup the datatype of the 'flag' argument

Browse Source 
As 'flag' is a combination of bits, so change its datatype from
'enum todo_item_flags' to 'unsigned'.

Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Mentored-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Charvi Mendiratta <charvi077@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Charvi Mendiratta 2021-02-09 00:55:19 +05:30 committed by Junio C Hamano
parent 2c0aa2ce2e
commit a25314c1ec
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sequencer.c
View File

@ -1744,8 +1744,7 @@ static const char skip_first_commit_msg_str[] = N_("The 1st commit message will
static const char skip_nth_commit_msg_fmt[] = N_("The commit message #%d will be skipped:"); static const char skip_nth_commit_msg_fmt[] = N_("The commit message #%d will be skipped:");
static const char combined_commit_msg_fmt[] = N_("This is a combination of %d commits."); static const char combined_commit_msg_fmt[] = N_("This is a combination of %d commits.");
static int check_fixup_flag(enum todo_command command, static int check_fixup_flag(enum todo_command command, unsigned flag)
enum todo_item_flags flag)
{ {
return command == TODO_FIXUP && ((flag & TODO_REPLACE_FIXUP_MSG) || return command == TODO_FIXUP && ((flag & TODO_REPLACE_FIXUP_MSG) ||
(flag & TODO_EDIT_FIXUP_MSG)); (flag & TODO_EDIT_FIXUP_MSG));
@ -1850,7 +1849,7 @@ static void update_squash_message_for_fixup(struct strbuf *msg)
static int append_squash_message(struct strbuf *buf, const char *body, static int append_squash_message(struct strbuf *buf, const char *body,
enum todo_command command, struct replay_opts *opts, enum todo_command command, struct replay_opts *opts,
enum todo_item_flags flag) unsigned flag)
{ {
const char *fixup_msg; const char *fixup_msg;
size_t commented_len = 0, fixup_off; size_t commented_len = 0, fixup_off;
@ -1906,7 +1905,7 @@ static int update_squash_messages(struct repository *r,
enum todo_command command, enum todo_command command,
struct commit *commit, struct commit *commit,
struct replay_opts *opts, struct replay_opts *opts,
enum todo_item_flags flag) unsigned flag)
{ {
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
int res = 0; int res = 0;