filter-branch: fix ref rewriting with --subdirectory-filter

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 7a7bc99955e9182be1fcd088932d49681a00dc35..78189c1b7bca120d896bab7a6160da1f436b4ff1 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1006,6 +1006,18 @@ _git_merge_base ()
        __gitcomp "$(__git_refs)"
 }
 
+_git_mv ()
+{
+       local cur="${COMP_WORDS[COMP_CWORD]}"
+       case "$cur" in
+       --*)
+               __gitcomp "--dry-run"
+               return
+               ;;
+       esac
+       COMPREPLY=()
+}
+
 _git_name_rev ()
 {
        __gitcomp "--tags --all --stdin"
@@ -1427,7 +1439,7 @@ _git_stash ()
                apply,--*)
                        __gitcomp "--index"
                        ;;
-               show,--*|apply,--*|drop,--*|pop,--*|branch,--*)
+               show,--*|drop,--*|pop,--*|branch,--*)
                        COMPREPLY=()
                        ;;
                show,*|apply,*|drop,*|pop,*|branch,*)
@@ -1639,6 +1651,7 @@ _git ()
        ls-tree)     _git_ls_tree ;;
        merge)       _git_merge;;
        merge-base)  _git_merge_base ;;
+       mv)          _git_mv ;;
        name-rev)    _git_name_rev ;;
        pull)        _git_pull ;;
        push)        _git_push ;;