Skip to content

Commit 9bcd306

Browse files
committed
flyby fixes
Just some fixes while perusing the codebase.
1 parent 33bd898 commit 9bcd306

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

crates/but-api/src/commands/workspace.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ pub struct StashIntoBranchParams {
524524

525525
/// This API allows the user to quickly "stash" a bunch of uncommitted changes - getting them out of the worktree.
526526
/// Unlike the regular stash, the user specifies a new branch where those changes will be 'saved'/committed.
527-
/// Immediatelly after the changes are committed, the branch is unapplied from the workspace, and the "stash" branch can be re-applied at a later time
527+
/// Immediately after the changes are committed, the branch is unapplied from the workspace, and the "stash" branch can be re-applied at a later time
528528
/// In theory it should be possible to specify an existing "dumping" branch for this, but currently this endpoint expects a new branch.
529529
pub fn stash_into_branch(
530530
app: &App,

crates/but-status/src/lib.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ use gix::status::index_worktree;
22

33
/// Creates a tree containing the uncommited changes in the project.
44
/// This includes files in the index that are considered conflicted.
5-
///
6-
/// TODO: This is a copy of `create_wd_tree` from the old world. Ideally we
7-
/// should share between the old and new worlds to prevent duplication beween
8-
/// these.
95
pub fn create_wd_tree(
106
repo: &gix::Repository,
117
untracked_limit_in_bytes: u64,

crates/gitbutler-edit-mode/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ pub mod commands;
3333

3434
const UNCOMMITTED_CHANGES_REF: &str = "refs/gitbutler/edit-uncommitted-changes";
3535

36-
/// Returns an index of the the tree of `commit` if it is unconflicted, *or* produce a merged tree
36+
/// Returns an index of the tree of `commit` if it is unconflicted, *or* produce a merged tree
3737
/// if `commit` is conflicted. That tree is turned into an index that records the conflicts that occurred
3838
/// during the merge.
3939
fn get_commit_index(repository: &git2::Repository, commit: &git2::Commit) -> Result<git2::Index> {

0 commit comments

Comments
 (0)