diff options
Diffstat (limited to 'src/sub_commands/list.rs')
| -rw-r--r-- | src/sub_commands/list.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/sub_commands/list.rs b/src/sub_commands/list.rs index c6af397..a815cc3 100644 --- a/src/sub_commands/list.rs +++ b/src/sub_commands/list.rs | |||
| @@ -436,12 +436,13 @@ pub async fn launch(_cli_args: &Cli, _args: &SubCommandArgs) -> Result<()> { | |||
| 436 | } | 436 | } |
| 437 | }; | 437 | }; |
| 438 | } | 438 | } |
| 439 | |||
| 440 | // tip of proposal in branch in history (local appendments made to up-to-date | 439 | // tip of proposal in branch in history (local appendments made to up-to-date |
| 441 | // proposal) | 440 | // proposal) |
| 442 | if let Ok((local_ahead_of_proposal, _)) = | 441 | else if git_repo.ancestor_of(&local_branch_tip, &proposal_tip)? { |
| 443 | git_repo.get_commits_ahead_behind(&proposal_tip, &local_branch_tip) | 442 | let (local_ahead_of_proposal, _) = git_repo |
| 444 | { | 443 | .get_commits_ahead_behind(&proposal_tip, &local_branch_tip) |
| 444 | .context("cannot get commits ahead behind for propsal_top and local_branch_tip")?; | ||
| 445 | |||
| 445 | println!( | 446 | println!( |
| 446 | "local proposal branch exists with {} unpublished commits on top of the most up-to-date version of the proposal ({} ahead {} behind '{main_branch_name}')", | 447 | "local proposal branch exists with {} unpublished commits on top of the most up-to-date version of the proposal ({} ahead {} behind '{main_branch_name}')", |
| 447 | local_ahead_of_proposal.len(), | 448 | local_ahead_of_proposal.len(), |