bash: Fix completion for git-dotfiles and hub

mislav/hub#2684

.local/share/bash-completion/completions/git-dotfiles

@@ -1,4 +1,9 @@
 #!bash
+# shellcheck disable=SC2239
 
-. /usr/share/bash-completion/completions/git
-complete -F _git git-dotfiles
+if ! declare -F __git_complete >/dev/null; then
+	_completion_loader git
+fi
+
+# FIXME: "git" instead of "__git_main" once https://github.com/git/git/commit/5a067ba9d04eebc92ad77f101b785219238f4f1e is released
+__git_complete git-dotfiles __git_main

.local/share/bash-completion/completions/hub

@@ -0,0 +1,15 @@
+#!bash
+# shellcheck disable=SC2239
+
+# drop once https://github.com/github/hub/issues/2684 is released
+
+if ! declare -F __git_complete >/dev/null; then
+	_completion_loader git
+fi
+
+function _git { __git_wrap__git_main "$@"; }
+
+. /usr/share/bash-completion/completions/hub
+
+__git_compute_all_commands
+__git_all_commands=$({ __git_list_all_commands 2>/dev/null; echo "$__git_all_commands"; } | sort -u)