haskal
/
starship
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: implement fallback branch_name for bare git repos (#1035) 

closes #686
This commit is contained in:
Hendrik Rombach 2020-04-07 12:01:40 +02:00 committed by GitHub
parent b905743364
commit 8d90baf0eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/git_branch.rs
View File

@ -30,7 +30,10 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
};
let repo = context.get_repo().ok()?;
let branch_name = repo.branch.as_ref()?;
// bare repos don't have a branch name, so `repo.branch.as_ref` would return None,
// but git treats "master" as the default branch name
let default_branch = String::from("master");
let branch_name = repo.branch.as_ref().unwrap_or(&default_branch);
let truncated_graphemes = get_graphemes(&branch_name, len);
// The truncation symbol should only be added if we truncated
let truncated_and_symbol = if len < graphemes_len(&branch_name) {

5
src/modules/git_status.rs
View File

@ -23,7 +23,10 @@ use std::collections::HashMap;
/// - `✘` — A file's deletion has been added to the staging area
pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
let repo = context.get_repo().ok()?;
let branch_name = repo.branch.as_ref()?;
// bare repos don't have a branch name, so `repo.branch.as_ref` would return None,
// but git treats "master" as the default branch name
let default_branch = String::from("master");
let branch_name = repo.branch.as_ref().unwrap_or(&default_branch);
let repo_root = repo.root.as_ref()?;
let mut repository = Repository::open(repo_root).ok()?;