diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-07-06 20:54:47 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-07-06 20:54:47 +0200 |
| commit | 391414e971d552e5e0fa1363347ec2c076062daf (patch) | |
| tree | 8f2e9d061386ff10a340dcb10e67eeb2a53a3ebe /wt-status.c | |
| parent | Merge branch 'pw/apply-too-large' (diff) | |
| parent | fix cherry-pick/revert status when doing multiple commits (diff) | |
| download | git-391414e971d552e5e0fa1363347ec2c076062daf.tar.xz git-391414e971d552e5e0fa1363347ec2c076062daf.zip | |
Merge branch 'jk/cherry-pick-revert-status'
During a cherry-pick or revert session that works on multiple
commits, "git status" did not give correct information, which has
been corrected.
* jk/cherry-pick-revert-status:
fix cherry-pick/revert status when doing multiple commits
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wt-status.c b/wt-status.c index ea4e49c42b..8a1a4fb1f0 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1793,10 +1793,10 @@ void wt_status_get_state(struct repository *r, oidcpy(&state->revert_head_oid, &oid); } if (!sequencer_get_last_command(r, &action)) { - if (action == REPLAY_PICK) { + if (action == REPLAY_PICK && !state->cherry_pick_in_progress) { state->cherry_pick_in_progress = 1; oidcpy(&state->cherry_pick_head_oid, null_oid()); - } else { + } else if (action == REPLAY_REVERT && !state->revert_in_progress) { state->revert_in_progress = 1; oidcpy(&state->revert_head_oid, null_oid()); } |