[PATCH 0/7] Various fixes to Git completion

[PATCH 0/7] Various fixes to Git completion

[Øystein Walle]

These are a collection of improvements and fixes to the Git completion
functions.

Regards,
Øsse

m0viefreak (3):
  _git: Remove unsupported -q option from diff options
  _git: fix a few "undocumented" options
  _git: revert: add '-e,--edit'

Øystein Walle (4):
  _git: Add missing column.* config variables
  _git: Make git-show accept diff arguments
  _git: re-order the last two git-blame arguments
  _git: fix wrong default value

 Completion/Unix/Command/_git | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

-- 
1.8.4.1.516.g1d25dd4

[PATCH 1/7] _git: Add missing column.* config variables

[Øystein Walle]

---
 Completion/Unix/Command/_git | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index d6f44e6..620d2c9 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1800,6 +1800,10 @@ _git-config () {
     blame.date:'date format to use in output::__git_date_formats:iso'
     'branch.*.description:branch description:branch description:->string'
     cvsexportcommit.cvsdir:'the default location of the CVS checkout to use for the export:cvs export dir:_directories'
+    column.ui:'specify whether supported commands should output in columns.::->column:never'
+    column.branch:'specify whether to output branch listing in git branch in columns::->column:never'
+    column.status:'specify whether to output untracked files in git status in columns::->column:never'
+    column.tag:'specify whether to output tag listing in git tag in columns::->column:never'
     core.fileMode:'track changes to the executable bit of files::->bool:true'
     core.attributesfile:'look into this file for attributes in addition to .gitattributes:additional attributes file:_files'
     core.abbrev:'set the length object names are abbreviated to:length:->int:7'
@@ -2374,6 +2378,7 @@ _git-config () {
           browser:'browser options'
           clean:'git clean options'
           color:'color options'
+          column:'column options'
           commit:'git commit options'
           diff:'diff options'
           difftool:'difftools'
@@ -2541,6 +2546,15 @@ _git-config () {
                 always:"always $parts[2]" \
                 {auto,true,yes,on}:$parts[2] && ret=0
               ;;
+            (column)
+              __git_config_values -- "$current" "$parts[5]" \
+                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 (implies "always")' \
+                row:'fill rows before columns (implies "akways")' \
+                plain:'show in one column (implies "always")' && ret=0
+              ;;
             (commit.cleanup)
               __git_config_values -- "$current" "$parts[5]" \
                 strip:'remove both whitespace and commentary lines' \
-- 
1.8.4.1.516.g1d25dd4

[PATCH 2/7] _git: Make git-show accept diff arguments

[Øystein Walle]

---
 Completion/Unix/Command/_git | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 620d2c9..63aa785 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1419,9 +1419,10 @@ _git-show () {
   local curcontext=$curcontext state line ret=1
   typeset -A opt_args
 
-  local -a log_options revision_options
+  local -a log_options revision_options diff_options
   __git_setup_log_options
   __git_setup_revision_options
+  __git_setup_diff_options
 
   _arguments -w -C -s \
     $log_options \
-- 
1.8.4.1.516.g1d25dd4

[PATCH 3/7] _git: re-order the last two git-blame arguments

[Øystein Walle]

The proper syntax is git blame [<commit>] <file> where <commit> is optional.
---
 Completion/Unix/Command/_git | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 63aa785..2edf116 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -3148,8 +3148,8 @@ _git-blame () {
     '-s[suppress author name and timestamp]' \
     '-w[ignore whitespace when finding lines]' \
     $revision_options \
-    ': :__git_cached_files' \
-    ':: :__git_revisions' && ret=0
+    ':: :__git_revisions' \
+    ': :__git_cached_files' && ret=0
 
   case $state in
     (line-range)
-- 
1.8.4.1.516.g1d25dd4

[PATCH 4/7] _git: Remove unsupported -q option from diff options

[Øystein Walle]

From: m0viefreak <m0viefreak.cm@googlemail.com>

---
 Completion/Unix/Command/_git | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 2edf116..75884b7 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -5959,7 +5959,6 @@ __git_setup_diff_options () {
     '(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)'{-3,--theirs}'[diff against "their branch" version]'
     '(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)-0[omit diff output for unmerged entries]'
     '(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)'{-c,--cc}'[compare "our branch", "their branch" and working tree files]'
-    '-q[remain silent even on nonexisting files]'
 
     # TODO: --cumulative is undocumented.
     '--cumulative[undocumented]'
-- 
1.8.4.1.516.g1d25dd4

[PATCH 5/7] _git: fix wrong default value

[Øystein Walle]

---
 Completion/Unix/Command/_git | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 75884b7..a75ce5c 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -2150,7 +2150,7 @@ _git-config () {
     sendemail.confirm:'type of confirmation required before sending::->sendemail.confirm:auto'
     sendemail.envelopesender:'envelope sender to send emails as::_email_addresses'
     sendemail.from:'sender email address::_email_addresses'
-    sendemail.multiedit:'edit all files at once::->bool:false'
+    sendemail.multiedit:'edit all files at once::->bool:true'
     sendemail.signedoffbycc:'add Signed-off-by\: or Cc\: lines to Cc\: header::->bool:true'
     sendemail.smtppass:'password to use for SMTP-AUTH:password:->string'
     sendemail.suppresscc:'rules for suppressing Cc\:::->sendemail.suppresscc'
-- 
1.8.4.1.516.g1d25dd4

[PATCH 6/7] _git: fix a few "undocumented" options

[Øystein Walle]

From: m0viefreak <m0viefreak.cm@googlemail.com>

commit: '--null' is documented
relink: '-h,--help' are never documented for subcommands but always exist
verify-tag: '-v,--verbose' are documented with updated description
diff: '--cumulative' is deprecated -> remove
---
 Completion/Unix/Command/_git | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index a75ce5c..6f631bc 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -624,7 +624,6 @@ _git-commit () {
     reset_author_opt='(--author)--reset-author[make committer the author of the commit]'
   fi
 
-  # TODO: --null is an undocumented alias.
   # TODO: --interactive isn’t explicitly listed in the documentation.
   _arguments -w -S -s \
     '(-a --all --interactive -o --only -i --include *)'{-a,--all}'[stage all modified and deleted paths]' \
@@ -2978,10 +2977,9 @@ _git-reflog () {
 
 (( $+functions[_git-relink] )) ||
 _git-relink () {
-  # TODO: --help is undocumented.
   _arguments \
     '--safe[stop if two objects with the same hash exist but have different sizes]' \
-    '--help[display help]' \
+    '(-)'{-h,--help}'[display usage information]' \
     ': :_directories' \
     ': :_directories' \
     '*: :_directories'
@@ -3419,9 +3417,8 @@ _git-show-branch () {
 
 (( $+functions[_git-verify-tag] )) ||
 _git-verify-tag () {
-  # TODO: -v and --verbose are undocumented.
   _arguments -w -S -s \
-    '(-v --verbose)'{-v,--verbose}'[output additional information]' \
+    '(-v --verbose)'{-v,--verbose}'[print the contents of the tag object before validating it]' \
     '*: :__git_tags'
 }
 
@@ -5960,8 +5957,6 @@ __git_setup_diff_options () {
     '(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)-0[omit diff output for unmerged entries]'
     '(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)'{-c,--cc}'[compare "our branch", "their branch" and working tree files]'
 
-    # TODO: --cumulative is undocumented.
-    '--cumulative[undocumented]'
     # TODO: --output is undocumented.
     '--output[undocumented]:undocumented')
 }
-- 
1.8.4.1.516.g1d25dd4

[PATCH 7/7] _git: revert: add '-e,--edit'

[Øystein Walle]

From: m0viefreak <m0viefreak.cm@googlemail.com>

---
 Completion/Unix/Command/_git | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 6f631bc..db1ff2f 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1320,8 +1320,9 @@ _git-revert () {
     '(- :)--quit[end revert or cherry-pick sequence]' \
     '(- :)--continue[resume revert or cherry-pick sequence]' \
     '(- :)--abort[cancel revert or cherry-pick sequence]' \
+    '(-e --edit --no-edit)'{-e,--edit}'[edit the commit before committing the revert]' \
+    '(-e --edit --no-edit)--no-edit[do not edit the commit message before committing the revert]' \
     '(-m --mainline)'{-m+,--mainline=}'[pick which parent is mainline]:parent number' \
-    '(-e --edit)--no-edit[do not edit the commit message]' \
     '(-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]' \
     ': :__git_commits'
-- 
1.8.4.1.516.g1d25dd4

Re: [PATCH 0/7] Various fixes to Git completion

[Frank Terbeck]

Heya!

I looked at both your series:

Øystein Walle wrote:
[...]
> m0viefreak (3):
>   _git: Remove unsupported -q option from diff options
>   _git: fix a few "undocumented" options
>   _git: revert: add '-e,--edit'
>
> Øystein Walle (4):
>   _git: Add missing column.* config variables
>   _git: Make git-show accept diff arguments
>   _git: re-order the last two git-blame arguments
>   _git: fix wrong default value
>
>  Completion/Unix/Command/_git | 36 +++++++++++++++++++++++-------------
>  1 file changed, 23 insertions(+), 13 deletions(-)
[...]
> Øystein Walle (6):
>   _git: Add git-clean -i/--interactive support
>   _git: Add new arguments introduced in Git v1.8.4
>   _git: Add status.short and status.branch
>   _git: Reword --heads to match new meaning
>   _git: Add two sub-comamnds introduced in v1.8.4
>   _git: Make --batch(-check) accept an argument
>
>  Completion/Unix/Command/_git | 42 ++++++++++++++++++++++++++++++++++++------
>  1 file changed, 36 insertions(+), 6 deletions(-)

I didn't find anything obviously wrong with those, so I'll import and
push them later today.

Thanks for your work, the both of you!

Regards, Frank

-- 
In protocol design, perfection has been reached not when there is
nothing left to add, but when there is nothing left to take away.
                                                  -- RFC 1925

[PATCH 1/2] completion: git: split diff options for stages (--theirs, --ours etc)

[Daniel Hahler]

From: Daniel Hahler <git@thequod.de>

This adds __git_setup_diff_stage_options and uses it with
_git-diff-files and _git-diff explicitly, removing it from the common
diff options.

For example, 'git show' should not complete '--theirs'.
---
 Completion/Unix/Command/_git | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 979e3e7..c9074ca 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -714,12 +714,14 @@ _git-diff () {
   local curcontext=$curcontext state line ret=1
   declare -A opt_args
 
-  local -a diff_options
+  local -a diff_options diff_stage_options
   __git_setup_diff_options
+  __git_setup_diff_stage_options
 
   _arguments -w -C -s \
     $* \
     $diff_options \
+    $diff_stage_options \
     '(--cached --staged)'{--cached,--staged}'[show diff between index and named commit]' \
     '(-)--[start file arguments]' \
     '*:: :->from-to-file' && ret=0
@@ -4341,11 +4343,13 @@ _git-cat-file () {
 
 (( $+functions[_git-diff-files] )) ||
 _git-diff-files () {
-  declare -a revision_options
+  local -a revision_options diff_stage_options
   __git_setup_revision_options
+  __git_setup_diff_stage_options
 
   _arguments -w -S -s \
     $revision_options \
+    $diff_stage_options \
     ': :__git_changed-in-working-tree_files' \
     ': :__git_changed-in-working-tree_files' \
     '*: :__git_changed-in-working-tree_files'
@@ -6214,14 +6218,20 @@ __git_setup_diff_options () {
     '(--no-prefix)--dst-prefix=[use given prefix for destination]:prefix'
     '(--src-prefix --dst-prefix)--no-prefix[do not show any source or destination prefix]'
 
+    '(-c,--cc)'{-b,--cc}'[combined diff format for merge commits]'
+
+    # TODO: --output is undocumented.
+    '--output[undocumented]:undocumented')
+}
+
+(( $+functions[__git_setup_diff_stage_options] )) ||
+__git_setup_diff_stage_options () {
+  diff_stage_options=(
     '(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)'{-1,--base}'[diff against "base" version]'
     '(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)'{-2,--ours}'[diff against "our branch" version]'
     '(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)'{-3,--theirs}'[diff against "their branch" version]'
     '(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)-0[omit diff output for unmerged entries]'
-    '(-0 -1 -2 -3 --base --ours --theirs -c --cc --no-index)'{-c,--cc}'[compare "our branch", "their branch" and working tree files]'
-
-    # TODO: --output is undocumented.
-    '--output[undocumented]:undocumented')
+  )
 }
 
 (( $+functions[__git_setup_revision_options] )) ||
-- 
2.4.0.dirty

[PATCH 2/2] completion: git: do not add diff options twice

[Daniel Hahler]

From: Daniel Hahler <git@thequod.de>

__git_setup_revision_options includes __git_setup_diff_options.
---
 Completion/Unix/Command/_git | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index c9074ca..4b1a5d1 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1083,12 +1083,10 @@ _git-log () {
   local -a log_options revision_options diff_options
   __git_setup_log_options
   __git_setup_revision_options
-  __git_setup_diff_options
 
   _arguments -w -C -s \
     $log_options \
     $revision_options \
-    $diff_options \
     '-L+[trace the evolution of a line range or regex within a file]:range' \
     '(-)--[start file arguments]' \
     '*:: :->commit-range-or-file' && ret=0
@@ -1486,10 +1484,9 @@ _git-show () {
   local curcontext=$curcontext state line ret=1
   typeset -A opt_args
 
-  local -a log_options revision_options diff_options
+  local -a log_options revision_options
   __git_setup_log_options
   __git_setup_revision_options
-  __git_setup_diff_options
 
   _arguments -w -C -s \
     $log_options \
-- 
2.4.0.dirty

Re: [PATCH 1/2] completion: git: split diff options for stages (--theirs, --ours etc)

[Daniel Shahaf]

Daniel Hahler wrote on Fri, May 08, 2015 at 16:46:44 +0200:
> @@ -6214,14 +6218,20 @@ __git_setup_diff_options () {
> +    '(-c,--cc)'{-b,--cc}'[combined diff format for merge commits]'

This -b should be -c.  I'll fix.