martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

; Fix last change.

Browse Source
This commit is contained in:
Sean Whitton
2026-01-30 13:49:35 +00:00
parent 93bba3797e
commit 83db778195
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/vc/vc-git.el
View File

@@ -785,7 +785,9 @@ ignored because that means we're not actually in a triangular workflow."
(string-trim-right (vc-git--out-str "config" key))))
(let* ((branch (vc-git-working-branch))
(pull (get (format "branch.%s.remote" branch)))
(merge (get (format "branch.%s.merge" branch)))
(merge (string-remove-prefix "refs/heads/"
(get (format "branch.%s.merge"
branch))))
(push (get (format "branch.%s.pushRemote" branch)))
(push (if (string-empty-p push)
(get "remote.pushDefault")