upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
path: root/src/sub_commands/pull.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/sub_commands/pull.rs')
-rw-r--r--src/sub_commands/pull.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/sub_commands/pull.rs b/src/sub_commands/pull.rs
index 5c8407e..9b74719 100644
--- a/src/sub_commands/pull.rs
+++ b/src/sub_commands/pull.rs
@@ -142,21 +142,21 @@ pub async fn launch() -> Result<()> {
142 local_ahead_of_proposal.len() 142 local_ahead_of_proposal.len()
143 ); 143 );
144 } else { 144 } else {
145 println!("you have an ammended/rebase version the proposal that is unpublished"); 145 println!("you have an amended/rebase version the proposal that is unpublished");
146 // user probably has a unpublished ammended or rebase version of the latest 146 // user probably has a unpublished amended or rebase version of the latest
147 // proposal version 147 // proposal version
148 // if tip of proposal commits exist (were once part of branch but have been 148 // if tip of proposal commits exist (were once part of branch but have been
149 // ammended and git clean up job hasn't removed them) 149 // amended and git clean up job hasn't removed them)
150 if git_repo.does_commit_exist(&proposal_tip.to_string())? { 150 if git_repo.does_commit_exist(&proposal_tip.to_string())? {
151 println!( 151 println!(
152 "you have previously applied the latest version of the proposal ({} ahead {} behind '{main_branch_name}') but your local proposal branch has ammended or rebased it ({} ahead {} behind '{main_branch_name}')", 152 "you have previously applied the latest version of the proposal ({} ahead {} behind '{main_branch_name}') but your local proposal branch has amended or rebased it ({} ahead {} behind '{main_branch_name}')",
153 most_recent_proposal_patch_chain.len(), 153 most_recent_proposal_patch_chain.len(),
154 proposal_behind_main.len(), 154 proposal_behind_main.len(),
155 local_ahead_of_main.len(), 155 local_ahead_of_main.len(),
156 local_beind_main.len(), 156 local_beind_main.len(),
157 ); 157 );
158 } 158 }
159 // user probably has a unpublished ammended or rebase version of an older 159 // user probably has a unpublished amended or rebase version of an older
160 // proposal version 160 // proposal version
161 else { 161 else {
162 println!( 162 println!(
@@ -168,7 +168,7 @@ pub async fn launch() -> Result<()> {
168 ); 168 );
169 169
170 println!( 170 println!(
171 "its likely that you have rebased / ammended an old proposal version because git has no record of the latest proposal commit." 171 "its likely that you have rebased / amended an old proposal version because git has no record of the latest proposal commit."
172 ); 172 );
173 println!( 173 println!(
174 "it is possible that you have been working off the latest version and git has delete this commit as part of a clean up" 174 "it is possible that you have been working off the latest version and git has delete this commit as part of a clean up"
@@ -183,7 +183,7 @@ pub async fn launch() -> Result<()> {
183 // TODO: this copy could be refined further based on this: 183 // TODO: this copy could be refined further based on this:
184 // - amended commits in the proposal 184 // - amended commits in the proposal
185 // - if local_base eq proposal base 185 // - if local_base eq proposal base
186 // - ammended an older version of proposal 186 // - amended an older version of proposal
187 // - if local_base is behind proposal_base 187 // - if local_base is behind proposal_base
188 // - rebased the proposal 188 // - rebased the proposal
189 // - if local_base is ahead of proposal_base 189 // - if local_base is ahead of proposal_base