Skip to content

Commit 2bbaa6f

Browse files
committed
fix a bunch more typos
1 parent 5dad9f4 commit 2bbaa6f

33 files changed

+97
-87
lines changed

CHANGELOG.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ Bugfix followup release - check `0.22.0` notes for more infos!
212212
### Added
213213
* stack popups ([#846](https://github.com/extrawurst/gitui/issues/846))
214214
* file history log [[@cruessler](https://github.com/cruessler)] ([#381](https://github.com/extrawurst/gitui/issues/381))
215-
* termux support on andriod [[@PeroSar](https://github.com/PeroSar)] ([#1139](https://github.com/extrawurst/gitui/issues/1139))
215+
* termux support on android [[@PeroSar](https://github.com/PeroSar)] ([#1139](https://github.com/extrawurst/gitui/issues/1139))
216216
* use `GIT_DIR` and `GIT_WORK_DIR` from environment if set ([#1191](https://github.com/extrawurst/gitui/pull/1191))
217217
* new [FAQ](./FAQ.md)s page
218218
* mention macports in install section [[@fs111](https://github.com/fs111)]([#1237](https://github.com/extrawurst/gitui/pull/1237))
@@ -648,7 +648,7 @@ Thanks for your interest and support over this year! Read more about the 1 year
648648
- min size for relative popups on small terminals ([#179](https://github.com/extrawurst/gitui/issues/179))
649649
- fix crash on resizing terminal to very small width ([#198](https://github.com/extrawurst/gitui/issues/198))
650650
- fix broken tags when using a different internal representation ([#206](https://github.com/extrawurst/gitui/issues/206))
651-
- tags are not cleanly seperated in details view ([#212](https://github.com/extrawurst/gitui/issues/212))
651+
- tags are not cleanly separated in details view ([#212](https://github.com/extrawurst/gitui/issues/212))
652652

653653
## [0.8.1] - 2020-07-07
654654

@@ -814,7 +814,7 @@ Thanks for your interest and support over this year! Read more about the 1 year
814814
### Changed
815815

816816
- show longer commit messages in log view
817-
- introduce propper error handling in `asyncgit` [[@MCord](https://github.com/MCord)]([#53](https://github.com/extrawurst/gitui/issues/53))
817+
- introduce proper error handling in `asyncgit` [[@MCord](https://github.com/MCord)]([#53](https://github.com/extrawurst/gitui/issues/53))
818818
- better error message when trying to run outside of a valid git repo ([#56](https://github.com/extrawurst/gitui/issues/56))
819819
- improve ctrl+c handling so it is checked first and no component needs to worry of blocking it
820820

asyncgit/src/asyncjob/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ impl<T: Copy + Send, P: Clone + Send + Sync + PartialEq>
2121
/// send an intermediate update notification.
2222
/// do not confuse this with the return value of `run`.
2323
/// `send` should only be used about progress notifications
24-
/// and not for the final notifcation indicating the end of the async job.
24+
/// and not for the final notification indicating the end of the async job.
2525
/// see `run` for more info
2626
pub fn send(&self, notification: T) -> Result<()> {
2727
self.sender.send(notification)?;
@@ -191,10 +191,10 @@ mod test {
191191
value_to_add: u32,
192192
}
193193

194-
type TestNotificaton = ();
194+
type TestNotification = ();
195195

196196
impl AsyncJob for TestJob {
197-
type Notification = TestNotificaton;
197+
type Notification = TestNotification;
198198
type Progress = ();
199199

200200
fn run(

asyncgit/src/remote_progress.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ impl RemoteProgress {
6666
Ok(())
6767
}
6868

69-
/// spawn thread to listen to progress notifcations coming in from blocking remote git method (fetch/push)
69+
/// spawn thread to listen to progress notifications coming in from blocking remote git method (fetch/push)
7070
pub(crate) fn spawn_receiver_thread<
7171
T: 'static + AsyncProgress,
7272
>(

asyncgit/src/sync/branch/merge_commit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ mod test {
263263
)
264264
.unwrap();
265265

266-
//this should not have commited cause we left conflicts behind
266+
//this should not have committed cause we left conflicts behind
267267
assert_eq!(res, None);
268268

269269
let state = crate::sync::repo_state(

asyncgit/src/sync/branch/merge_rebase.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use crate::{
1010
use git2::BranchType;
1111
use scopetime::scope_time;
1212

13-
/// trys merging current branch with its upstrema using rebase
13+
/// tries merging current branch with its upstream using rebase
1414
pub fn merge_upstream_rebase(
1515
repo_path: &RepoPath,
1616
branch_name: &str,

asyncgit/src/sync/branch/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ pub fn checkout_remote_branch(
384384
if let Err(e) = repo.checkout_head(Some(
385385
git2::build::CheckoutBuilder::new().force(),
386386
)) {
387-
// This is safe beacuse cur_ref was just found
387+
// This is safe because cur_ref was just found
388388
repo.set_head(bytes2string(cur_ref.name_bytes())?.as_str())?;
389389
return Err(Error::Git(e));
390390
}

asyncgit/src/sync/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ mod tests {
318318
eprintln!("\n----\n{cmd}");
319319
}
320320

321-
/// helper to fetch commmit details using log walker
321+
/// helper to fetch commit details using log walker
322322
pub fn get_commit_ids(
323323
r: &Repository,
324324
max_count: usize,

asyncgit/src/sync/remotes/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ mod tests {
254254
&format!("git remote add origin {remote_path}")[..],
255255
);
256256

257-
//NOTE: aparently remotes are not chronolically sorted but alphabetically
257+
//NOTE: apparently remotes are not chronolically sorted but alphabetically
258258
let remotes = get_remotes(repo_path).unwrap();
259259

260260
assert_eq!(

asyncgit/src/sync/reword.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ fn get_current_branch(
4949
/// Changes the commit message of a commit with a specified oid
5050
///
5151
/// While this function is most commonly associated with doing a
52-
/// reword opperation in an interactive rebase, that is not how it
52+
/// reword operation in an interactive rebase, that is not how it
5353
/// is implemented in git2rs
5454
///
5555
/// This is dangerous if it errors, as the head will be detached so this should

asyncgit/src/sync/staging/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,13 @@ pub(crate) fn apply_selection(
100100
};
101101

102102
if !first_hunk_encountered {
103-
let any_slection_in_hunk =
103+
let any_selection_in_hunk =
104104
hunk.lines.iter().any(|line| {
105105
let line: DiffLinePosition = line.into();
106106
lines.contains(&line)
107107
});
108108

109-
first_hunk_encountered = any_slection_in_hunk;
109+
first_hunk_encountered = any_selection_in_hunk;
110110
}
111111

112112
if first_hunk_encountered {

0 commit comments

Comments
 (0)