builtin/apply: make gitdiff_*() return 1 at end of header

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index ddda5e5e27a1f0dcf0513e4c1c0037f218f1286d..10f6d52254335edeb2253df5b9e63bb4d5608150 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2691,6 +2691,32 @@ _git_whatchanged ()
        _git_log
 }
 
+_git_worktree ()
+{
+       local subcommands="add list lock prune unlock"
+       local subcommand="$(__git_find_on_cmdline "$subcommands")"
+       if [ -z "$subcommand" ]; then
+               __gitcomp "$subcommands"
+       else
+               case "$subcommand,$cur" in
+               add,--*)
+                       __gitcomp "--detach"
+                       ;;
+               list,--*)
+                       __gitcomp "--porcelain"
+                       ;;
+               lock,--*)
+                       __gitcomp "--reason"
+                       ;;
+               prune,--*)
+                       __gitcomp "--dry-run --expire --verbose"
+                       ;;
+               *)
+                       ;;
+               esac
+       fi
+}
+
 __git_main ()
 {
        local i c=1 command __git_dir