diff options
Diffstat (limited to 'src/bin')
| -rw-r--r-- | src/bin/git-restore-autosave.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/bin/git-restore-autosave.rs b/src/bin/git-restore-autosave.rs index b948cc2..e02bb90 100644 --- a/src/bin/git-restore-autosave.rs +++ b/src/bin/git-restore-autosave.rs @@ -39,7 +39,7 @@ fn main() -> Result<(), anyhow::Error> { let gitconfig = repository.config()?; let repo_id = gitconfig.get_entry("autosave.id")?; let signature = repository.signature()?; - let branch = git_autosave::current_branch(&repository)?; + let branch = git_autosave::utils::current_branch(&repository)?; let earliest_time = repository.head()?.peel_to_commit()?.time(); let config: &'static _ = Box::leak(Box::new(Config::load()?)); @@ -113,8 +113,9 @@ fn main() -> Result<(), anyhow::Error> { .expect("There should be an autosave to select but there isn't. This is a bug!") }; let autosaved_commit = repository.find_commit(autosave.commit_id)?; - let workdir = repository.find_tree(git_autosave::workdir_to_tree(&repository)?)?; - let new_tree = git_autosave::merge_commit_with_tree(&repository, &autosaved_commit, &workdir)?; + let workdir = repository.find_tree(git_autosave::utils::workdir_to_tree(&repository)?)?; + let new_tree = + git_autosave::utils::merge_commit_with_tree(&repository, &autosaved_commit, &workdir)?; git_autosave::save_undo_tree(&repository, &workdir)?; git_autosave::saved_restored_autosave(&repository, &autosave)?; |