global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-06 07:19:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

replay: support empty commit ranges

Browse Source 
In a subsequent commit we're about to introduce a new user of the replay
subsystem. With that new user, the range of commits that we'll want to
replay will be identified implicitly via a single commit, and will
include all descendants of that commit to any branch. If that commit has
no descendants (because it's the tip of some branch), then the range of
revisions that we're asked to replay becomes empty. This case does not
make sense with git-replay(1), but with the new command it will.

This case is not currently supported by `replay_revisions()` though
because we zero-initialize `struct merge_result`. This includes its
`.clean` member, which indicates whether the merge ran into a conflict
or not. But given that we don't have any revision to replay, we won't
ever perform any merge at all, and consequently that member will never
be set to `1`. We thus later think that there's been a merge conflict
and return an error from `replay_commits()`.

Address this issue by initializing the `.clean` member to `1`.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2026-01-13 10:54:35 +01:00
committed by Junio C Hamano
parent 410e378060
commit 5425771568
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
replay.c
View File

@@ -266,7 +266,9 @@ int replay_revisions(struct rev_info *revs,
struct commit *commit;
struct commit *onto = NULL;
struct merge_options merge_opt;
struct merge_result result;
struct merge_result result = {
.clean = 1,
};
char *advance;
int ret;
@@ -282,7 +284,6 @@ int replay_revisions(struct rev_info *revs,
}
init_basic_merge_options(&merge_opt, revs->repo);
memset(&result, 0, sizeof(result));
merge_opt.show_rename_progress = 0;
last_commit = onto;
replayed_commits = kh_init_oid_map();