Merge commit '9982ab6fb5266298c056326ed265fc8560202603' into debian

This is exactly one commit after the zsh-5.0.7 and adds one missing
(and not unimportant) changelog entry for the 5.0.7 release.

1 files changed, 56 insertions, 14 deletions

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index b1f411a5e..c4e386b15 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -104,6 +104,8 @@ _git-am () {
   # undocumented (and not implemented here).
   _arguments -S \
     '(-s --signoff)'{-s,--signoff}'[add Signed-off-by: line to the commit message]' \
+    '(-S --gpg-sign --no-gpg-sign)'{-S-,--gpg-sign=}'[GPG-sign the commit]::key id' \
+    '(-S --gpg-sign --no-gpg-sign)--no-gpg-sign[do not GPG-sign the commit]' \
     '(-k --keep)'{-k,--keep}'[pass -k to git mailinfo]' \
     '--keep-non-patch[pass -b to git mailinfo]' \
     '(          --no-keep-cr)--keep-cr[pass --keep-cr to git mailsplit]' \
@@ -508,6 +510,8 @@ _git-cherry-pick () {
     '(-m --mainline)'{-m,--mainline}'[specify mainline when cherry-picking a merge commit]:parent number' \
     '(-n --no-commit --ff)'{-n,--no-commit}'[do not make the actually commit]' \
     '(-s --signoff --ff)'{-s,--signoff}'[add Signed-off-by line at the end of the commit message]' \
+    '(-S --gpg-sign --no-gpg-sign)'{-S-,--gpg-sign=}'[GPG-sign the commit]::key id' \
+    '(-S --gpg-sign --no-gpg-sign)--no-gpg-sign[do not GPG-sign the commit]' \
     '*'{-s,--strategy=}'[use given merge strategy]:merge strategy:__git_merge_strategies' \
     '*'{-X,--strategy-option=}'[pass merge-strategy-specific option to merge strategy]' \
     '(-e --edit -x -n --no-commit -s --signoff)--ff[fast forward, if possible]' \
@@ -663,6 +667,7 @@ _git-commit () {
     '--cleanup=[specify how the commit message should be cleaned up]:mode:((verbatim\:"do not change the commit message at all"
                                                                             whitespace\:"remove leading and trailing whitespace lines"
                                                                             strip\:"remove both whitespace and commentary lines"
+                                                                            scissors\:"same as whitespace but cut from scissor line"
                                                                             default\:"act as '\''strip'\'' if the message is to be edited and as '\''whitespace'\'' otherwise"))' \
     '(-e --edit --no-edit)'{-e,--edit}'[edit the commit message before committing]' \
     '(-e --edit --no-edit)--no-edit[do not edit the commit message before committing]' \
@@ -677,7 +682,8 @@ _git-commit () {
     '--dry-run[only show list of paths that are to be commited or not, and any untracked]' \
     '(         --no-status)--status[include the output of git status in the commit message template]' \
     '(--status            )--no-status[do not include the output of git status in the commit message template]' \
-    '(-S --gpg-sign)'{-S-,--gpg-sign=}'[GPG-sign the commit]::key id' \
+    '(-S --gpg-sign --no-gpg-sign)'{-S-,--gpg-sign=}'[GPG-sign the commit]::key id' \
+    '(-S --gpg-sign --no-gpg-sign)--no-gpg-sign[do not GPG-sign the commit]' \
     '(-a --all --interactive -o --only -i --include *)--interactive[interactively update paths in the index file]' \
     '*: :__git_ignore_line_inside_arguments __git_changed_files' \
     - '(message)' \
@@ -870,8 +876,9 @@ _git-format-patch () {
     '*--add-header=[add an arbitrary header to email headers]:header' \
     '--cover-letter[generate a cover letter template]' \
     '--notes=[append notes for the commit after the three-dash line]:: :__git_notes_refs' \
-    '(            --no-signature)--signature=[add a signature]:signature' \
-    '(--signature               )--no-signature[do not add a signature]' \
+    '(            --no-signature --signature-file)--signature=[add a signature]:signature' \
+    '(--signature                --signature-file)--no-signature[do not add a signature]' \
+    '(--signature --no-signature                 )--signature-file=[use contents of file as signature]' \
     '--suffix=[use the given suffix for filenames]:filename suffix' \
     '--quiet[suppress the output of the names of generated files]' \
     '--no-binary[do not output contents of changes in binary files, only note that they differ]' \
@@ -1317,6 +1324,8 @@ _git-rebase () {
     '--keep-empty[keep empty commits in the result]' \
     '(- :)--skip[skip the current patch]' \
     '(-m --merge)'{-m,--merge}'[use merging strategies to rebase]' \
+    '(-S --gpg-sign --no-gpg-sign)'{-S-,--gpg-sign=}'[GPG-sign the commit]::key id' \
+    '(-S --gpg-sign --no-gpg-sign)--no-gpg-sign[do not GPG-sign the commit]' \
     '*'{-s,--strategy=}'[use given merge strategy]:merge strategy:__git_merge_strategies' \
     '*'{-X,--strategy-option=}'[pass merge-strategy-specific option to merge strategy]' \
     '(-q --quiet -v --verbose --stat -n --no-stat)'{-q,--quiet}'[suppress all output]' \
@@ -1349,6 +1358,7 @@ _git-reset () {
   _arguments -w -C -s \
       '(       --mixed --hard --merge --keep -p --patch -- *)--soft[do not touch the index file nor the working tree]' \
       '(--soft         --hard --merge --keep -p --patch -- *)--mixed[reset the index but not the working tree (default)]' \
+      '(--soft         --hard --merge --keep -p --patch -- *)-N[keep --intent-to-add entries in the index]' \
       '(--soft --mixed        --merge --keep -p --patch -- *)--hard[match the working tree and index to the given tree]' \
       '(--soft --mixed --hard         --keep -p --patch -- *)--merge[reset out of a conflicted merge]' \
       '(--soft --mixed --hard --merge        -p --patch -- *)--keep[like --hard, but keep local working tree changes]' \
@@ -1382,6 +1392,8 @@ _git-revert () {
     '(-m --mainline)'{-m+,--mainline=}'[pick which parent is mainline]:parent number' \
     '(-n --no-commit)'{-n,--no-commit}'[do not commit the reversion]' \
     '(-s --signoff)'{-s,--signoff}'[add Signed-off-by line at the end of the commit message]' \
+    '(-S --gpg-sign --no-gpg-sign)'{-S-,--gpg-sign=}'[GPG-sign the commit]::key id' \
+    '(-S --gpg-sign --no-gpg-sign)--no-gpg-sign[do not GPG-sign the commit]' \
     ': :__git_commits'
 }
 
@@ -1752,11 +1764,13 @@ _git-tag () {
       '*:: :__git_ignore_line_inside_arguments __git_tags' \
     - listing \
       '-n+[limit line output of annotation]: :__git_guard_number "limit"' \
-      '-l[list tags matching pattern]' \
+      '(-l --list)'{-l,--list}'[list tags matching pattern]' \
       '(--no-column)--column=-[display tag listing in columns]::column.tag option:((always\:"always show in columns" never\:"never show in columns" auto\:"show in columns if the output is to the terminal" column\:"fill columns before rows (default)" row\:"fill rows before columns" plain\:"show in one column" dense\:"make unequal size columns to utilize more space" nodense\:"make equal size columns"))' \
       '(--column)--no-column[do not display in columns]' \
       '--contains=[only list tags which contain the specified commit]: :__git_commits' \
       '--points-at=[only list tags of the given object]: :__git_commits' \
+      '--sort=[specify how the tags should be sorted]:mode:((refname\:"lexicographic order"
+                                                             version\\\:refname\:"tag names are treated as version numbers"))' \
       '::pattern' \
     - verification \
       '-v[verifies gpg signutare of tags]' \
@@ -1890,7 +1904,7 @@ _git-config () {
     core.packedGitWindowSize:'size of mappings of pack files:pack window size:->bytes'
     core.packedGitLimit:'maximum number of bytes to map from pack files:maximum pack file map size:->bytes'
     core.precomposeunicode:'revert the unicode decomposition of filenames done by Mac OS::->bool:false'
-    core.deltaBaseCacheLimit:'maximum size of cache for base objects:maximum base objects cache size:->bytes:16m'
+    core.deltaBaseCacheLimit:'maximum size of cache for base objects:maximum base objects cache size:->bytes:96m'
     core.bigFileThreshold:'maximum size of files to compress:maximum compress size:->bytes:512m'
     core.excludesfile:'additional file to use for exclusion:excludes file:_files'
     core.askpass:'program to use for asking for passwords:password command:_path_commands'
@@ -1898,7 +1912,7 @@ _git-config () {
     core.pager:'pager to use for paginating output:pager:_path_commands'
     core.whitespace:'list of common whitespace problems to notice::->core.whitespace'
     core.fsyncobjectfiles:'fsync() when writing object files::->bool:false'
-    core.preloadindex:'use parallel index preload for operations like git diff::->bool:false'
+    core.preloadindex:'use parallel index preload for operations like git diff::->bool:true'
     core.createObject:'take steps to prevent overwriting existing objects::->core.createObject:link'
     core.checkstat:'determine which stat fields to match between the index and work tree::->core.checkstat:default'
     core.notesRef:'show notes in given refs:refs:->string:refs/notes/commits'
@@ -1969,6 +1983,7 @@ _git-config () {
     color.status.nobranch:'color of no-branch warning::->color'
     color.ui:'color output of capable git commands::->color-bool:auto'
     commit.cleanup:'default --cleanup option::->commit.cleanup:default'
+    commit.gpgsign:'always GPG-sign commits::->bool:false'
     commit.status:'include status information in commit message template::->bool:true'
     commit.template:'template file for commit messages:template:_files'
     'diff.*.binary:make the diff driver treat files as binary::->bool:false'
@@ -2017,6 +2032,7 @@ _git-config () {
     format.signoff:'enable --signoff by default::->bool:false'
     'gc.*.reflogexpire:grace period for git reflog expire::->days:90'
     'gc.*.reflogexpireunreachable:grace period for git reflog expire for unreachable entries::->days:30'
+    gc.aggressiveDepth:'maximum delta depth:maximum delta depth::->int:250'
     gc.aggressiveWindow:'window size used in delta compression algorithm::->int:250'
     gc.auto:'minimum limit for packing loose objects with --auto::->int:6700'
     gc.autopacklimit:'minimum limit for packing packs with --auto::->int:50'
@@ -2077,6 +2093,7 @@ _git-config () {
     guitool.title:'title of prompt dialog:prompt title:->string'
     guitool.prompt:'prompt to display:prompt:->string'
     grep.extendedRegexp:'enable --extended-regexp option by default (ignored when grep.patternType is set)::->bool:false'
+    grep.fullname:'enable --full-name option by default::->bool:false'
     grep.lineNumber:'enable -n option by default::->bool:false'
     grep.patternType:'default matching pattern type::->grep.patternType:default'
     help.browser:'browser used to display help in web format::__git_browsers'
@@ -2161,7 +2178,7 @@ _git-config () {
     'man.*.path:path to use for the man viewer:absolute man tool path:_files -g "*(*)"'
     merge.branchdesc:'populate the log message with the branch description text as well::->bool:false'
     merge.conflictstyle:'style used for conflicted hunks::->merge.conflictstyle:merge'
-    merge.defaultToUpstream:'merge the upstream branches configured for the current branch by default::->bool:false'
+    merge.defaultToUpstream:'merge the upstream branches configured for the current branch by default::->bool:true'
     merge.ff:'allow fast-forward merges::->merge.ff:true'
     merge.log:'include summaries of merged commits in new merge commit messages::->bool:false'
     merge.renameLimit:'number of files to consider when detecting copy/renames during merge:limit:->int'
@@ -2192,10 +2209,11 @@ _git-config () {
     pack.threads:'number of threads to use for searching for best delta matches:number of threads:->int'
     pack.indexVersion:'default pack index version:index version:->string'
     pack.packSizeLimit:'maximum size of packs:maximum size of packs:->bytes'
+    pull.ff:'accept fast-forwards only::->bool:false'
     pull.octopus:'default merge strategy to use when pulling multiple branches::__git_merge_strategies'
     pull.rebase:'rebase branches on top of the fetched branch, instead of merging::->pull.rebase:false'
     pull.twohead:'default merge strategy to use when pulling a single branch::__git_merge_strategies'
-    push.default:'action git push should take if no refspec is given::->push.default:matching'
+    push.default:'action git push should take if no refspec is given::->push.default:simple'
     rebase.stat:'show a diffstat of what changed upstream since last rebase::->bool:false'
     rebase.autosquash:'autosquash by default::->bool:false'
     rebase.autostash:'autostash by default::->bool:false'
@@ -2311,6 +2329,7 @@ _git-config () {
     'svn-remote.*.pushurl:URL to push to::_urls'
     'svn-remote.*.branches:branch mappings:branch mapping:->string'
     'svn-remote.*.tags:tag mappings:tag mapping:->string'
+    tag.sort:'Default sorting method:->string'
     'tar.*.command:specify a shell command through which the tar output generated by git archive should be piped::_path_commands'
     'tar.*.remote:enable <format> for use by remote clients via git-upload-archive::->bool'
     tar.umask:'umask to apply::->umask'
@@ -2319,6 +2338,7 @@ _git-config () {
     transfer.hiderefs:'string(s) to decide which refs to omit from initial advertisements:hidden refs:->string'
     uploadpack.hiderefs:'string(s) upload-pack uses to decide which refs to omit from its initial advertisement:hidden refs:->string'
     uploadpack.allowtipsha1inwant:'allow upload-pack to accept a fetch request that asks for an object at the tip of a hidden ref::->bool:false'
+    uploadarchive.allowUnreachable:'allow git-upload-archive to accept an archive requests that ask for unreachable objects::->bool:false'
     'url.*.insteadOf:string to start URLs with:prefix:->string'
     'url.*.pushInsteadOf:string to start URLs to push to with:prefix:->string'
     user.email:'email address used for commits::_email_addresses'
@@ -2516,6 +2536,7 @@ _git-config () {
           tar:'git tar-tree options'
           transfer:'options controlling transfers'
           uploadpack:'git upload-pack options'
+          uploadarchive:'git upload-archive options'
           url:'URL prefixes'
           user:'options controlling user identity'
           web:'web options'
@@ -3219,6 +3240,8 @@ _git-repack () {
 (( $+functions[_git-replace] )) ||
 _git-replace () {
   _arguments -w -S -s \
+    '--edit[edit existing object as base a starting point]' \
+    '--graft[rewrite the parents of a commit]' \
     '(- *)-f[overwrite existing replace ref]' \
     '(- 2)-d[delete existing replace refs]' \
     '(- : *)-l[list replace refs]:pattern' \
@@ -3530,6 +3553,13 @@ _git-show-branch () {
   return ret
 }
 
+(( $+functions[_git-verify-commit] )) ||
+_git-verify-commit () {
+  _arguments -w -S -s \
+    '(-v --verbose)'{-v,--verbose}'[print the contents of the commit object before validating it]' \
+    '*: :__git_commits'
+}
+
 (( $+functions[_git-verify-tag] )) ||
 _git-verify-tag () {
   _arguments -w -S -s \
@@ -3654,6 +3684,8 @@ _git-send-email () {
     '--annotate[review and edit each patch before sending it]' \
     '--bcc=[Bcc: value for each email]: :_email_addresses' \
     '--cc=[starting Cc: value for each email]: :_email_addresses' \
+    '--to-cover[Copy the To: list from the first file to the rest]' \
+    '--cc-cover[Copy the Cc: list from the first file to the rest]' \
     '--compose[edit introductory message for patch series]' \
     '--from=[specify sender]:email address:_email_addresses' \
     '--in-reply-to=[specify contents of first In-Reply-To header]:message-id' \
@@ -3683,7 +3715,7 @@ _git-send-email () {
     '(--suppress-from                   )--no-suppress-from[add the From: address to the Cc: list]' \
     '(         --no-thread)--thread[set In-Reply-To: and References: headers]' \
     '(--thread            )--no-thread[do not set In-Reply-To: and References: headers]' \
-    '--confirm[specify type of confirmation required before sending]: :__git_sendemail_confirm' \
+    '--confirm[specify type of confirmation required before sending]: :__git_sendemail_confirm_values' \
     '--dry-run[do everything except actually sending the emails]' \
     '(               --no-format-patch)--format-patch[interpret ambiguous arguments as format-patch arguments]' \
     '(--format-patch                  )--no-format-patch[interpret ambiguous arguments file-name arguments]' \
@@ -3954,13 +3986,14 @@ _git-apply () {
 
   _arguments -w -S -s \
     $apply_options \
+    '(--index --cached --reject)'{-3,--3way}'[fall back on 3-way merge if patch fails]' \
     '--stat[output diffstat for input (turns off "apply")]' \
     '--numstat[same as --stat but in decimal notation and complete pathnames (turns off "apply")]' \
     '--summary[output summary of git-diff extended headers (turns off "apply")]' \
     '--check[check if patches are applicable (turns off "apply")]' \
     '(        --cached)--index[make sure that patch is applicable to index]' \
     '(--index         )--cached[apply patches without touching working tree]' \
-    '--build-face-ancestor[build temporary index for blobs with ambiguous origin]:index:_files' \
+    '--build-fake-ancestor[build temporary index for blobs with ambiguous origin]:index:_files' \
     '(-R --reverse)'{-R,--reverse}'[apply patches in reverse]' \
     '-z[use NUL termination on output]' \
     '--unidiff-zero[disable unified-diff-context check]' \
@@ -5049,6 +5082,7 @@ _git_commands () {
     rerere:'reuse recorded resolution of conflicted merges'
     rev-parse:'pick out and massage parameters for other git commands'
     show-branch:'show branches and their commits'
+    verify-commit:'check GPG signature of commits'
     verify-tag:'check GPG signature of tags'
     whatchanged:'show commit-logs and differences they introduce')
 
@@ -6135,7 +6169,8 @@ __git_setup_revision_options () {
     '--parents[display parents of commit]'
     '--children[display children of commit]'
     '--left-right[mark which side of symmetric diff commit is reachable from]'
-    '--graph[display graphical representation of commit history]'
+    '(--show-linear-break        )--graph[display graphical representation of commit history]'
+    '(                    --graph)--show-linear-break=[show a barrier between commits from different branches]:barrier'
     '--count[display how many commits would have been listed]'
     '(-n --max-count)'{-n+,--max-count=}'[maximum number of commits to display]: :__git_guard_number'
     '--skip=[skip given number of commits before output]: :__git_guard_number'
@@ -6222,6 +6257,8 @@ __git_setup_merge_options () {
     '(         --no-squash)--squash[merge, but do not commit]'
     '(--squash            )--no-squash[merge and commit]'
     '--ff-only[refuse to merge unless HEAD is up to date or merge can be resolved as a fast-forward]'
+    '(-S --gpg-sign --no-gpg-sign)'{-S-,--gpg-sign=}'[GPG-sign the commit]::key id' \
+    '(-S --gpg-sign --no-gpg-sign)--no-gpg-sign[do not GPG-sign the commit]' \
     '*'{-s,--strategy=}'[use given merge strategy]:merge strategy:__git_merge_strategies'
     '*'{-X,--strategy-option=}'[pass merge-strategy-specific option to merge strategy]'
     '(--verify-signatures)--verify-signatures[verify the commits being merged or abort]'
@@ -6429,6 +6466,7 @@ __git_diff-or-merge-tools () {
     vimdiff
     gvimdiff
     vimdiff2
+    vimdiff3
     gvimdiff2
     emerge
     ecmerge
@@ -6560,9 +6598,13 @@ _git() {
   if (( CURRENT > 2 )); then
     local -a aliases
     local -A git_aliases
-    # TODO: Should use -z here, but I couldn't get it to work.
-    aliases=(${(f)${${${(f)"$(_call_program aliases git config --get-regexp '\^alias\.')"}#alias.}/ /$'\n'}/(#e)/$'\n'})
-    (( $#aliases % 2 == 0 )) && git_aliases=($aliases)
+    local k v
+    aliases=(${(0)"$(_call_program aliases git config -z --get-regexp '\^alias\.')"})
+    for a in ${aliases}; do
+        k="${${a/$'\n'*}/alias.}"
+        v="${a#*$'\n'}"
+        git_aliases[$k]="$v"
+    done
 
     if (( $+git_aliases[$words[2]] && !$+commands[git-$words[2]] && !$+functions[_git-$words[2]] )); then
       local -a tmpwords expalias