Merge branch 'jc/clone'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index d75f47a1acc85f901a32482f06a8fb47b68a83bb..82b9ed40d84dbb72c72e282392ca8eb247ab527e 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1,8 +1,9 @@
 #
 # bash completion support for core Git.
 #
-# Copyright (C) 2006,2007 Shawn Pearce
+# Copyright (C) 2006,2007 Shawn O. Pearce <spearce@spearce.org>
 # Conceptually based on gitcompletion (http://gitweb.hawaga.org.uk/).
+# Distributed under the GNU General Public License, version 2.0.
 #
 # The contained completion routines provide support for completing:
 #
@@ -11,6 +12,7 @@
 #    *) .git/remotes file names
 #    *) git 'subcommands'
 #    *) tree paths within 'ref:path/to/file' expressions
+#    *) common --long-options
 #
 # To use these routines:
 #
@@ -31,6 +33,17 @@
 #       are currently in a git repository.  The %s token will be
 #       the name of the current branch.
 #
+# To submit patches:
+#
+#    *) Read Documentation/SubmittingPatches
+#    *) Send all patches to the current maintainer:
+#
+#       "Shawn O. Pearce" <spearce@spearce.org>
+#
+#    *) Always CC the Git mailing list:
+#
+#       git@vger.kernel.org
+#
 
 __gitdir ()
 {
@@ -579,13 +592,13 @@ _git_log ()
                __gitcomp "
                        --max-count= --max-age= --since= --after=
                        --min-age= --before= --until=
-                       --root --not --topo-order --date-order
+                       --root --topo-order --date-order --reverse
                        --no-merges
                        --abbrev-commit --abbrev=
                        --relative-date
                        --author= --committer= --grep=
                        --all-match
-                       --pretty= --name-status --name-only
+                       --pretty= --name-status --name-only --raw
                        --not --all
                        "
                return
@@ -669,8 +682,11 @@ _git_push ()
                        esac
                        __gitcomp "$(__git_refs "$remote")" "" "${cur#*:}"
                        ;;
+               +*)
+                       __gitcomp "$(__git_refs)" + "${cur#+}"
+                       ;;
                *)
-                       __gitcomp "$(__git_refs2)"
+                       __gitcomp "$(__git_refs)"
                        ;;
                esac
                ;;
@@ -751,9 +767,11 @@ _git_config ()
        case "$cur" in
        --*)
                __gitcomp "
-                       --global --list --replace-all
+                       --global --system
+                       --list --replace-all
                        --get --get-all --get-regexp
                        --add --unset --unset-all
+                       --remove-section --rename-section
                        "
                return
                ;;
@@ -772,7 +790,10 @@ _git_config ()
        remote.*.*)
                local pfx="${cur%.*}."
                cur="${cur##*.}"
-               __gitcomp "url fetch push" "$pfx" "$cur"
+               __gitcomp "
+                       url fetch push skipDefaultUpdate
+                       receivepack uploadpack tagopt
+                       " "$pfx" "$cur"
                return
                ;;
        remote.*)
@@ -822,6 +843,9 @@ _git_config ()
                format.headers
                gitcvs.enabled
                gitcvs.logfile
+               gitcvs.allbinary
+               gitcvs.dbname gitcvs.dbdriver gitcvs.dbuser gitcvs.dvpass
+               gc.packrefs
                gc.reflogexpire
                gc.reflogexpireunreachable
                gc.rerereresolved
@@ -838,9 +862,11 @@ _git_config ()
                i18n.commitEncoding
                i18n.logOutputEncoding
                log.showroot
+               merge.tool
                merge.summary
                merge.verbosity
                pack.window
+               pack.depth
                pull.octopus
                pull.twohead
                repack.useDeltaBaseOffset
@@ -864,13 +890,13 @@ _git_remote ()
        while [ $c -lt $COMP_CWORD ]; do
                i="${COMP_WORDS[c]}"
                case "$i" in
-               add|show|prune) command="$i"; break ;;
+               add|show|prune|update) command="$i"; break ;;
                esac
                c=$((++c))
        done
 
        if [ $c -eq $COMP_CWORD -a -z "$command" ]; then
-               __gitcomp "add show prune"
+               __gitcomp "add show prune update"
                return
        fi
 
@@ -878,6 +904,18 @@ _git_remote ()
        show|prune)
                __gitcomp "$(__git_remotes)"
                ;;
+       update)
+               local i c='' IFS=$'\n'
+               for i in $(git --git-dir="$(__gitdir)" config --list); do
+                       case "$i" in
+                       remotes.*)
+                               i="${i#remotes.}"
+                               c="$c ${i/=*/}"
+                               ;;
+                       esac
+               done
+               __gitcomp "$c"
+               ;;
        *)
                COMPREPLY=()
                ;;
@@ -934,6 +972,11 @@ _git_show ()
        __git_complete_file
 }
 
+_git_stash ()
+{
+       __gitcomp 'list show apply clear'
+}
+
 _git ()
 {
        local i c=1 command __git_dir
@@ -990,6 +1033,7 @@ _git ()
        shortlog)    _git_shortlog ;;
        show)        _git_show ;;
        show-branch) _git_log ;;
+       stash)       _git_stash ;;
        whatchanged) _git_log ;;
        *)           COMPREPLY=() ;;
        esac
@@ -1035,6 +1079,7 @@ complete -o default -o nospace -F _git_remote git-remote
 complete -o default -o nospace -F _git_reset git-reset
 complete -o default -o nospace -F _git_shortlog git-shortlog
 complete -o default -o nospace -F _git_show git-show
+complete -o default -o nospace -F _git_stash git-stash
 complete -o default -o nospace -F _git_log git-show-branch
 complete -o default -o nospace -F _git_log git-whatchanged