Skip to content

Commit

Permalink
repostate: allow "commit" in "goto --merge" state
Browse files Browse the repository at this point in the history
Summary:
I didn't think this was useful, but there is an eden integration test that makes a commit after resolving merge conflicts but before running "goto --continue".

Let's just re-allow this without thinking too hard.

Reviewed By: genevievehelsel

Differential Revision: D52051317

fbshipit-source-id: fa45410762f0d733443c163c89f7b0d58f99a9c6
  • Loading branch information
muirdm authored and facebook-github-bot committed Dec 12, 2023
1 parent b0d38df commit 70163f0
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions eden/scm/lib/workingcopy/repostate/src/command_state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,7 @@ static STATES: &[State] = &[
command: "goto",
description: "goto --merge in progress",
state_file: "updatemergestate",
// In Python, we allowed "commit", but I don't think that makes sense (anymore).
allows: &[],
allows: &[Operation::Commit],
proceed: "goto --continue",
abort: "goto --clean",
abort_lossy: true,
Expand Down

0 comments on commit 70163f0

Please sign in to comment.