Merge branch 'js/fsmonitor-unflake' into maint

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 42a3c8e52417d42a255c68a4f6f24a1518bb3404..9f71bcde967bc50915b90eaef72061f8c6a56315 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1536,7 +1536,7 @@ _git_fetch ()
                return
                ;;
        --filter=*)
-               __gitcomp "blob:none blob:limit= sparse:oid= sparse:path=" "" "${cur##--filter=}"
+               __gitcomp "blob:none blob:limit= sparse:oid=" "" "${cur##--filter=}"
                return
                ;;
        --*)
@@ -2611,7 +2611,7 @@ _git_submodule ()
 {
        __git_has_doubledash && return
 
-       local subcommands="add status init deinit update summary foreach sync absorbgitdirs"
+       local subcommands="add status init deinit update set-branch summary foreach sync absorbgitdirs"
        local subcommand="$(__git_find_on_cmdline "$subcommands")"
        if [ -z "$subcommand" ]; then
                case "$cur" in
@@ -2642,6 +2642,9 @@ _git_submodule ()
                        --force --rebase --merge --reference --depth --recursive --jobs
                "
                ;;
+       set-branch,--*)
+               __gitcomp "--default --branch"
+               ;;
        summary,--*)
                __gitcomp "--cached --files --summary-limit"
                ;;