global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-28 11:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

sequencer (rebase -i): implement the 'reword' command

Browse Source 
This is now trivial, as all the building blocks are in place: all we need
to do is to flip the "edit" switch when committing.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2016-04-13 14:13:31 +02:00
parent 9a090b8544
commit d5079ea359
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sequencer.c
View File

@@ -752,6 +752,7 @@ enum todo_command {
TODO_PICK = 0,
TODO_REVERT,
TODO_EDIT,
TODO_REWORD,
TODO_FIXUP,
TODO_SQUASH,
/* commands that do something else than handling a single commit */
@@ -767,6 +768,7 @@ static struct {
{ 'p', "pick" },
{ 0, "revert" },
{ 'e', "edit" },
{ 'r', "reword" },
{ 'f', "fixup" },
{ 's', "squash" },
{ 'x', "exec" },
@@ -997,7 +999,9 @@ static int do_pick_commit(enum todo_command command, struct commit *commit,
}
}
if (is_fixup(command)) {
if (command == TODO_REWORD)
edit = 1;
else if (is_fixup(command)) {
if (update_squash_messages(command, commit, opts))
return -1;
amend = 1;
@@ -1756,7 +1760,8 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
}
else if (res && is_rebase_i(opts))
return res | error_with_patch(item->commit,
item->arg, item->arg_len, opts, res, 0);
item->arg, item->arg_len, opts, res,
item->command == TODO_REWORD);
}
else if (item->command == TODO_EXEC) {
char *end_of_arg = (char *)(item->arg + item->arg_len);