hannes/git-repo-manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refuse to convert to worktree with ignored files

Browse Source
This commit is contained in:
Hannes Körber
2021-12-23 18:33:14 +01:00
parent 3ac88260b5
commit 3ff7b61518
2 changed files with 97 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/grm/main.rs
View File

@@ -258,18 +258,22 @@ fn main() {
process::exit(1);
});
let status = repo.status(false).unwrap_or_else(|error| {
print_error(&format!("Failed getting repo changes: {}", error));
process::exit(1);
});
if status.changes.is_some() {
print_error("Changes found in repository, refusing to convert");
process::exit(1);
}
match repo.convert_to_worktree(&cwd) {
Ok(_) => print_success("Conversion done"),
Err(error) => print_error(&format!("Error during conversion: {}", error)),
Err(reason) => {
match reason {
repo::WorktreeConversionFailureReason::Changes => {
print_error("Changes found in repository, refusing to convert");
}
repo::WorktreeConversionFailureReason::Ignored => {
print_error("Ignored files found in repository, refusing to convert. Run git clean -f -d -X to remove them manually.");
}
repo::WorktreeConversionFailureReason::Error(error) => {
print_error(&format!("Error during conversion: {}", error));
}
}
process::exit(1);
}
}
}
cmd::WorktreeAction::Clean(_args) => {