diff options
| author | DanConwayDev <DanConwayDev@protonmail.com> | 2024-02-20 12:17:25 +0000 |
|---|---|---|
| committer | DanConwayDev <DanConwayDev@protonmail.com> | 2024-02-20 12:17:25 +0000 |
| commit | 570ad62875c191c6bb7809e936a64938eb0fb310 (patch) | |
| tree | 295f3f1543dc950559297981af4dde3052820de1 /src/sub_commands/push.rs | |
| parent | 32a3ca5b3c5fa202ffb6b5670f3aa1e77c331f8d (diff) | |
refactor: tweak error wording
remove the word nostr for consistency and as its a bit confusing
Diffstat (limited to 'src/sub_commands/push.rs')
| -rw-r--r-- | src/sub_commands/push.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sub_commands/push.rs b/src/sub_commands/push.rs index 0fdd56f..2500e9f 100644 --- a/src/sub_commands/push.rs +++ b/src/sub_commands/push.rs | |||
| @@ -76,14 +76,14 @@ pub async fn launch(cli_args: &Cli) -> Result<()> { | |||
| 76 | .context("latest patch event commit tag isn't a valid SHA1 hash")?; | 76 | .context("latest patch event commit tag isn't a valid SHA1 hash")?; |
| 77 | 77 | ||
| 78 | if most_recent_patch_commit_id.eq(&branch_tip) { | 78 | if most_recent_patch_commit_id.eq(&branch_tip) { |
| 79 | bail!("nostr proposal already up-to-date with local branch"); | 79 | bail!("proposal already up-to-date with local branch"); |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | if most_recent_proposal_patch_chain.iter().any(|e| { | 82 | if most_recent_proposal_patch_chain.iter().any(|e| { |
| 83 | let c = tag_value(e, "parent-commit").unwrap_or_default(); | 83 | let c = tag_value(e, "parent-commit").unwrap_or_default(); |
| 84 | c.eq(&branch_tip.to_string()) | 84 | c.eq(&branch_tip.to_string()) |
| 85 | }) { | 85 | }) { |
| 86 | bail!("nostr proposal is ahead of local branch"); | 86 | bail!("proposal is ahead of local branch"); |
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | let (ahead, behind) = git_repo | 89 | let (ahead, behind) = git_repo |