summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_git2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c77e0a525..2e5b99cd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2015-10-25 Daniel Shahaf <d.s@daniel.shahaf.name>
+ * 36964: Completion/Unix/Command/_git: _git: Complete remotes
+ branch names with slashes correctly.
+
* 36960: Completion/Unix/Command/_git: _git: Enable slash matcher
for more branch and tag completions, include 'git branch <TAB>'
and 'git tag <TAB>'.
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index e5005f1c3..f22cddb3e 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -5559,7 +5559,7 @@ __git_remote_branch_names_noprefix () {
local expl
declare -a heads
- branch_names=(${${${(f)"$(_call_program remote-branch-refs-noprefix git for-each-ref --format='"%(refname)"' refs/remotes 2>/dev/null)"}##*/}:#HEAD})
+ branch_names=(${${${${(f)"$(_call_program remote-branch-refs-noprefix git for-each-ref --format='"%(refname)"' refs/remotes 2>/dev/null)"}#refs/remotes/}#*/}:#HEAD})
__git_command_successful $pipestatus || return 1
_wanted remote-branch-names-noprefix expl 'remote branch name' compadd -M 'r:|/=**' "$@" -a - branch_names