mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pw/rebase-skip-commit-message-fix'

Browse Source 
"git rebase -i" with a series of squash/fixup, when one of the
steps stopped in conflicts and ended up getting skipped, did not
handle the accumulated commit log messages, which has been
corrected.

* pw/rebase-skip-commit-message-fix:
  rebase --skip: fix commit message clean up when skipping squash
This commit is contained in:
Junio C Hamano
2023-08-09 16:18:16 -07:00
parent 8cdd5e713d 6ce7afe163
commit e8c53ff912
4 changed files with 94 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
sequencer.c
View File

@ -5048,19 +5048,31 @@ static int commit_staged_changes(struct repository *r,
* We need to update the squash message to skip
* the latest commit message.
*/
int res = 0;
struct commit *commit;
const char *msg;
const char *path = rebase_path_squash_msg();
const char *encoding = get_commit_output_encoding();
if (parse_head(r, &commit) ||
!(p = repo_logmsg_reencode(r, commit, NULL, encoding)) ||
write_message(p, strlen(p), path, 0)) {
repo_unuse_commit_buffer(r, commit, p);
return error(_("could not write file: "
"'%s'"), path);
if (parse_head(r, &commit))
return error(_("could not parse HEAD"));
p = repo_logmsg_reencode(r, commit, NULL, encoding);
if (!p) {
res = error(_("could not parse commit %s"),
oid_to_hex(&commit->object.oid));
goto unuse_commit_buffer;
}
repo_unuse_commit_buffer(r,
commit, p);
find_commit_subject(p, &msg);
if (write_message(msg, strlen(msg), path, 0)) {
res = error(_("could not write file: "
"'%s'"), path);
goto unuse_commit_buffer;
}
unuse_commit_buffer:
repo_unuse_commit_buffer(r, commit, p);
if (res)
return res;
}
}