diff options
| author | DanConwayDev <DanConwayDev@protonmail.com> | 2024-02-16 20:43:14 +0000 |
|---|---|---|
| committer | DanConwayDev <DanConwayDev@protonmail.com> | 2024-02-16 20:43:14 +0000 |
| commit | 454c955d60e6f313bf8da6822337cace9bb6fc16 (patch) | |
| tree | b18e1c4d818a8702004c76b4f12ecd62913ae88c | |
| parent | a645273433fe3a716dd9c43ad9276da066af6127 (diff) | |
refactor: improve error when patch ahead of master
minor improvement to error message
| -rw-r--r-- | src/git.rs | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -372,7 +372,7 @@ impl RepoActions for Repo { | |||
| 372 | if let Ok(last_patch) = patches_to_apply.last().context("no patches") { | 372 | if let Ok(last_patch) = patches_to_apply.last().context("no patches") { |
| 373 | last_patch | 373 | last_patch |
| 374 | } else { | 374 | } else { |
| 375 | self.checkout(branch_name).context("latest commit in pr doesnt connect with an existing commit. Try a git pull first.")?; | 375 | self.checkout(branch_name).context("latest commit in pr doesnt connect with an existing commit. Try a git pull on master first.")?; |
| 376 | return Ok(vec![]); | 376 | return Ok(vec![]); |
| 377 | }, | 377 | }, |
| 378 | "parent-commit", | 378 | "parent-commit", |