Skip to content

Commit 9ee679e

Browse files
Merge pull request #13691 from gitbutlerapp/caleb/repository-to-repo
`repo` is preferred in our codebase
2 parents 07dbfbd + 29bd64f commit 9ee679e

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

crates/but-api/src/commit/uncommit.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ pub fn commit_uncommit_only_with_perm(
163163
(
164164
&mut graph.into_workspace()?,
165165
rebase.history.commit_mappings(),
166-
rebase.repository(),
166+
rebase.repo(),
167167
)
168168
} else {
169169
let materialized = rebase.materialize_without_checkout()?;
@@ -293,7 +293,7 @@ pub fn commit_uncommit_changes_only_with_perm(
293293
(
294294
&mut graph.into_workspace()?,
295295
outcome.rebase.history.commit_mappings(),
296-
outcome.rebase.repository(),
296+
outcome.rebase.repo(),
297297
)
298298
} else {
299299
let materialized = outcome.rebase.materialize_without_checkout()?;

crates/but-api/src/workspace_state.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ impl WorkspaceState {
5959
) -> anyhow::Result<WorkspaceState> {
6060
Self::from_workspace(
6161
&rebase.overlayed_graph()?.into_workspace()?,
62-
rebase.repository(),
62+
rebase.repo(),
6363
replaced_commits,
6464
)
6565
}

crates/but-rebase/src/graph_rebase/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ impl<'ws, 'meta, M: RefMetadata> SuccessfulRebase<'ws, 'meta, M> {
269269
///
270270
/// This repository may contain objects that have not been persisted yet,
271271
/// which makes it suitable for dry-run inspection of [`Self::overlayed_graph`].
272-
pub fn repository(&self) -> &gix::Repository {
272+
pub fn repo(&self) -> &gix::Repository {
273273
&self.repo
274274
}
275275

0 commit comments

Comments
 (0)