From 391add767fbf5137e8fef3f01e107f751353538c Mon Sep 17 00:00:00 2001 From: Thomas O'Donnell Date: Sat, 11 Apr 2020 22:10:39 +0200 Subject: =?UTF-8?q?revert:=20fix(git=5Fbranch,git=5Fstatus):=20implement?= =?UTF-8?q?=20fallback=20branch=5Fn=E2=80=A6=20(#1092)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 8d90baf0eb299710585c12bb9629b20fd696c3ff. --- src/modules/git_branch.rs | 5 +---- src/modules/git_status.rs | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/modules/git_branch.rs b/src/modules/git_branch.rs index 4b58c33de..56414b19a 100644 --- a/src/modules/git_branch.rs +++ b/src/modules/git_branch.rs @@ -30,10 +30,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { }; let repo = context.get_repo().ok()?; - // 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 branch_name = repo.branch.as_ref()?; 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) { diff --git a/src/modules/git_status.rs b/src/modules/git_status.rs index b689b070e..0778bbce9 100644 --- a/src/modules/git_status.rs +++ b/src/modules/git_status.rs @@ -23,10 +23,7 @@ use std::collections::HashMap; /// - `✘` — A file's deletion has been added to the staging area pub fn module<'a>(context: &'a Context) -> Option> { let repo = context.get_repo().ok()?; - // 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 branch_name = repo.branch.as_ref()?; let repo_root = repo.root.as_ref()?; let mut repository = Repository::open(repo_root).ok()?; -- cgit v1.2.3