diff options
| author | DanConwayDev <DanConwayDev@protonmail.com> | 2024-03-08 16:49:03 +0000 |
|---|---|---|
| committer | DanConwayDev <DanConwayDev@protonmail.com> | 2024-03-08 17:27:13 +0000 |
| commit | 098b0258fdd581c750099cb463adbddb57843388 (patch) | |
| tree | 000b80fd630083aefef314ec999060c65fb57573 /src/sub_commands/pull.rs | |
| parent | 6b3aecbcbde669859533716225e9c3bbfd2023b2 (diff) | |
feat(send): compare against origin/main vs main
catch more errors when proposed commits
are not connected to origin/main branch
improve default selected commits when on main branch
Diffstat (limited to 'src/sub_commands/pull.rs')
| -rw-r--r-- | src/sub_commands/pull.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sub_commands/pull.rs b/src/sub_commands/pull.rs index daae37f..716e6c5 100644 --- a/src/sub_commands/pull.rs +++ b/src/sub_commands/pull.rs | |||
| @@ -60,7 +60,7 @@ pub async fn launch() -> Result<()> { | |||
| 60 | get_most_recent_patch_with_ancestors(commit_events.clone()) | 60 | get_most_recent_patch_with_ancestors(commit_events.clone()) |
| 61 | .context("cannot get most recent patch for proposal")?; | 61 | .context("cannot get most recent patch for proposal")?; |
| 62 | 62 | ||
| 63 | let local_branch_tip = git_repo.get_tip_of_local_branch(&branch_name)?; | 63 | let local_branch_tip = git_repo.get_tip_of_branch(&branch_name)?; |
| 64 | 64 | ||
| 65 | let (main_branch_name, master_tip) = git_repo.get_main_or_master_branch()?; | 65 | let (main_branch_name, master_tip) = git_repo.get_main_or_master_branch()?; |
| 66 | 66 | ||