Skip to content

Commit 3d63d76

Browse files
authored
Merge pull request #640 from treatybreaker/fix/pull-no-status
2 parents c8412eb + 8d0b842 commit 3d63d76

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

lua/neogit/popups/branch/init.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ local actions = require("neogit.popups.branch.actions")
66
local config_actions = require("neogit.popups.branch_config.actions")
77

88
function M.create()
9-
local current_branch = git.repo.head.branch or ""
9+
local current_branch = git.branch.current()
1010
local show_config = current_branch ~= "" and current_branch ~= "(detached)"
1111
local pull_rebase_entry = git.config.get("pull.rebase")
1212
local pull_rebase = pull_rebase_entry:is_set() and pull_rebase_entry.value or "false"

lua/neogit/popups/branch_config/init.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ local git = require("neogit.lib.git")
55
local actions = require("neogit.popups.branch_config.actions")
66

77
function M.create(branch)
8-
branch = branch or git.repo.head.branch
8+
branch = branch or git.branch.current()
99
local g_pull_rebase = git.config.get_global("pull.rebase")
1010
local pull_rebase_entry = git.config.get("pull.rebase")
1111
local pull_rebase = pull_rebase_entry:is_set() and pull_rebase_entry.value or "false"

lua/neogit/popups/pull/init.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ local popup = require("neogit.lib.popup")
55
local M = {}
66

77
function M.create()
8-
local current = git.repo.head.branch
8+
local current = git.branch.current()
99
local show_config = current ~= "" and current ~= "(detached)"
1010
local pull_rebase_entry = git.config.get("pull.rebase")
1111
local pull_rebase = pull_rebase_entry:is_set() and pull_rebase_entry.value or "false"

lua/neogit/popups/push/init.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ local git = require("neogit.lib.git")
55
local M = {}
66

77
function M.create()
8-
local current = git.repo.head.branch
8+
local current = git.branch.current()
99

1010
local p = popup
1111
.builder()

lua/neogit/popups/rebase/init.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ local actions = require("neogit.popups.rebase.actions")
55
local M = {}
66

77
function M.create(commit)
8-
local branch = git.repo.head.branch
8+
local branch = git.branch.current()
99
local in_rebase = git.repo.rebase.head
1010
local base_branch = actions.base_branch()
1111

0 commit comments

Comments
 (0)