From 34ba14e1ec69e3811a72ecc3545e99890bff578a Mon Sep 17 00:00:00 2001 From: Øystein Walle Date: Sun, 20 Oct 2013 19:40:59 +0200 Subject: 31853: _git: Add missing column.* config variables --- ChangeLog | 5 +++++ Completion/Unix/Command/_git | 14 ++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3064963d5..f424c83c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-10-21 Øystein Walle + + * 31853: Completion/Unix/Command/_git: _git: Add missing column.* + config variables + 2013-10-19 Peter Stephenson * 31851: Src/exec.c: execstring() should display string to diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index d6f44e679..620d2c966 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' \ -- cgit 1.4.1 From 7872a5becdc3ead1d8ea809bfe88b8d9a0b4b599 Mon Sep 17 00:00:00 2001 From: Øystein Walle Date: Sun, 20 Oct 2013 19:41:00 +0200 Subject: 31854: _git: Make git-show accept diff arguments --- ChangeLog | 3 +++ Completion/Unix/Command/_git | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f424c83c0..b54a778ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ * 31853: Completion/Unix/Command/_git: _git: Add missing column.* config variables + * 31854: Completion/Unix/Command/_git: _git: Make git-show accept + diff arguments + 2013-10-19 Peter Stephenson * 31851: Src/exec.c: execstring() should display string to diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 620d2c966..63aa78512 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 \ -- cgit 1.4.1 From 5585b95f3c65d87f698234a781552b006b56e930 Mon Sep 17 00:00:00 2001 From: Øystein Walle Date: Sun, 20 Oct 2013 19:41:01 +0200 Subject: 31859: _git: re-order the last two git-blame arguments The proper syntax is git blame [] where is optional. --- ChangeLog | 3 +++ Completion/Unix/Command/_git | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b54a778ff..5e7370a26 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,9 @@ * 31854: Completion/Unix/Command/_git: _git: Make git-show accept diff arguments + * 31859: Completion/Unix/Command/_git: _git: re-order the last two + git-blame arguments + 2013-10-19 Peter Stephenson * 31851: Src/exec.c: execstring() should display string to diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 63aa78512..2edf116cf 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) -- cgit 1.4.1 From 80cb8e947fc2c28e7be4a4e548f0bb34f2a19e9d Mon Sep 17 00:00:00 2001 From: m0viefreak Date: Sun, 20 Oct 2013 19:41:02 +0200 Subject: 31857: _git: Remove unsupported -q option from diff options --- ChangeLog | 5 +++++ Completion/Unix/Command/_git | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5e7370a26..fd8d54704 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-10-21 m0viefreak + + * 31857: Completion/Unix/Command/_git: _git: Remove unsupported -q + option from diff options + 2013-10-21 Øystein Walle * 31853: Completion/Unix/Command/_git: _git: Add missing column.* diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 2edf116cf..75884b717 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]' -- cgit 1.4.1 From 07ca60acf44a4cf1d08eed9279897a8060f862ef Mon Sep 17 00:00:00 2001 From: Øystein Walle Date: Sun, 20 Oct 2013 19:41:03 +0200 Subject: 31858: _git: fix wrong default value --- ChangeLog | 5 +++++ Completion/Unix/Command/_git | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fd8d54704..8753fa1b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-10-21 Øystein Walle + + * 31858: Completion/Unix/Command/_git: _git: fix wrong default + value + 2013-10-21 m0viefreak * 31857: Completion/Unix/Command/_git: _git: Remove unsupported -q diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 75884b717..a75ce5c76 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' -- cgit 1.4.1 From 2c1affc6c10fb59ed900d5dc5bf146a0b9851890 Mon Sep 17 00:00:00 2001 From: m0viefreak Date: Sun, 20 Oct 2013 19:41:04 +0200 Subject: 31856: _git: fix a few "undocumented" options 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 --- ChangeLog | 5 +++++ Completion/Unix/Command/_git | 9 ++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8753fa1b5..61743a9f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-10-21 m0viefreak + + * 31856: Completion/Unix/Command/_git: _git: fix a few + "undocumented" options + 2013-10-21 Øystein Walle * 31858: Completion/Unix/Command/_git: _git: fix wrong default diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index a75ce5c76..6f631bced 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') } -- cgit 1.4.1 From 7a37568b8c6a142e9ccbae3a96fb6041a46646f5 Mon Sep 17 00:00:00 2001 From: m0viefreak Date: Sun, 20 Oct 2013 19:41:05 +0200 Subject: 31855: _git: revert: add '-e,--edit' --- ChangeLog | 3 +++ Completion/Unix/Command/_git | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 61743a9f1..e98598fd0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ * 31856: Completion/Unix/Command/_git: _git: fix a few "undocumented" options + * 31855: Completion/Unix/Command/_git: _git: revert: add + '-e,--edit' + 2013-10-21 Øystein Walle * 31858: Completion/Unix/Command/_git: _git: fix wrong default diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 6f631bced..db1ff2f3f 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' -- cgit 1.4.1 From e91d90125beb975ae49b9445477c6cae61b286f7 Mon Sep 17 00:00:00 2001 From: Øystein Walle Date: Sun, 20 Oct 2013 19:43:29 +0200 Subject: 31861: _git: Add git-clean -i/--interactive support - Add -i and --interactive to _git-clean() - Add column.clean configuration variable --- ChangeLog | 5 +++++ Completion/Unix/Command/_git | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index e98598fd0..a6e1479bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-10-21 Øystein Walle + + * 31861: Completion/Unix/Command/_git: _git: Add git-clean + -i/--interactive support + 2013-10-21 m0viefreak * 31856: Completion/Unix/Command/_git: _git: fix a few diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index db1ff2f3f..25f925f78 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -508,6 +508,7 @@ _git-clean () { _arguments -w -C -S -s \ '-d[also remove untracked directories]' \ '(-f --force)'{-f,--force}'[required when clean.requireForce is true (default)]' \ + '(-i --interactive)'{-i,--interactive}'[show what would be done and clean files interactively]' \ '(-n --dry-run)'{-n,--dry-run}'[only show what would and what would not be removed]' \ '(-q --quiet)'{-q,--quiet}'[only report errors]' \ '*'{-e,--exclude=}'[skip files matching specified pattern]:pattern' \ @@ -1803,6 +1804,7 @@ _git-config () { 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.clean:'specify the layout when listing items in git clean -i::->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' -- cgit 1.4.1 From 805b6659019ae5ab7bfe9b7e78f48f35db568f9d Mon Sep 17 00:00:00 2001 From: Øystein Walle Date: Sun, 20 Oct 2013 19:43:30 +0200 Subject: 31863: _git: Add new arguments introduced in Git v1.8.4 --- ChangeLog | 3 +++ Completion/Unix/Command/_git | 13 ++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a6e1479bb..62af20e16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ * 31861: Completion/Unix/Command/_git: _git: Add git-clean -i/--interactive support + * 31863: Completion/Unix/Command/_git: _git: Add new arguments + introduced in Git v1.8.4 + 2013-10-21 m0viefreak * 31856: Completion/Unix/Command/_git: _git: fix a few diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 25f925f78..5b1e71063 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -684,6 +684,7 @@ _git-describe () { '(--abbrev)--long[always show full format, even for exact matches]' \ '--match=[only consider tags matching glob pattern]:pattern' \ '--always[show uniquely abbreviated commit object as fallback]' \ + '--first-parent[follow only the first parent of merge commits]' \ '*: :__git_committishs' } @@ -835,6 +836,7 @@ _git-format-patch () { '(-k --keep-subject)--subject-prefix=[use the given prefix instead of \[PATCH\]]:prefix' \ '*--to=[add To: header to email headers]: :_email_addresses' \ '*--cc=[add Cc: header to email headers]: :_email_addresses' \ + '--from=[add From: header to email headers]: :_email_addresses' \ '*--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' \ @@ -1050,6 +1052,7 @@ _git-log () { $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 @@ -1241,6 +1244,7 @@ _git-push () { '(-q --quiet -v --verbose --progress)'{-q,--quiet}'[suppress all output]' \ '(-q --quiet -v --verbose)'{-v,--verbose}'[output additional information]' \ '(-q --quiet)--progress[output progress information]' \ + '(--verify)--no-verify[bybass the pre-push hook]' \ '--recurse-submodules=[submodule handling]:submodule handling:((check\:"refuse pushing of supermodule if submodule commit cannot be found on the remote" on-demand\:"push all changed submodules"))' \ ':: :__git_any_repositories' \ @@ -5884,13 +5888,14 @@ __git_setup_log_options () { (( $+functions[__git_setup_diff_options] )) || __git_setup_diff_options () { - local diff_types='(-p -u --patch -U --unified --raw --patch-with-raw --stat --numstat --shortstat --dirstat --dirstat-by-file --summary --patch-with-stat --name-only --name-status --cumulative)' + local diff_types='(-p -u --patch -U --unified --raw --patch-with-raw --stat --numstat --shortstat --dirstat --dirstat-by-file --summary --patch-with-stat --name-only --name-status --cumulative -s --no-patch)' diff_options=( $diff_types{-p,-u,--patch}'[generate diff in patch format]' $diff_types{-U,--unified=}'[generate diff with given lines of context]: :__git_guard_number lines' $diff_types'--raw[generate default raw diff output]' $diff_types'--patch-with-raw[generate patch but also keep the default raw diff output]' + $diff_types{-s,--no-patch}'[suppress diff output]' '(--minimal --patience --histogram --diff-algorithm)--minimal[spend extra time to make sure the smallest possible diff is producedm]' '(--minimal --patience --histogram --diff-algorithm)--patience[generate diffs with patience algorithm]' '(--minimal --patience --histogram --diff-algorithm)--histogram[generate diffs with histogram algorithm]' @@ -5942,6 +5947,7 @@ __git_setup_diff_options () { '--ignore-space-at-eol[ignore changes in whitespace at end of line]' '(-b --ignore-space-change -w --ignore-all-space)'{-b,--ignore-space-change}'[ignore changes in amount of white space]' '(-b --ignore-space-change -w --ignore-all-space)'{-w,--ignore-all-space}'[ignore white space when comparing lines]' + '--ignore-blank-lines[do not show hunks that add or remove blank lines]' '--inter-hunk-context=[combine hunks closer than n lines]:n' '--exit-code[report exit code 1 if differences, 0 otherwise]' '(--exit-code)--quiet[disable all output]' @@ -6035,8 +6041,9 @@ __git_setup_revision_options () { '(--full-history --dense --simplify-merges --ancestry-path)--sparse[when paths are given, display only commits that changes any of them]' '(--full-history --dense --sparse --ancestry-path)--simplify-merges[milder version of --full-history]' '(--full-history --dense --sparse --simplify-merges )--ancestry-path[only display commits that exists directly on ancestry chains]' - '( --date-order)--topo-order[display commits in topological order]' - '(--topo-order )--date-order[display commits in date order]' + '( --date-order --author-date-order)--topo-order[display commits in topological order]' + '(--topo-order --author-date-order)--date-order[display commits in date order]' + '(--topo-order --date-order )--author-date-order[display commits in auhor date order]' '(-g --walk-reflogs)--reverse[display commits in reverse order]' '( --objects-edge)--objects[display object ids of objects referenced by listed commits]' '(--objects )--objects-edge[display object ids of objects referenced by listed and excluded commits]' -- cgit 1.4.1 From baee0a2295c7d6de79c7aa576c5a7cea30c9fd5d Mon Sep 17 00:00:00 2001 From: Øystein Walle Date: Sun, 20 Oct 2013 19:43:31 +0200 Subject: 31862: _git: Add status.short and status.branch --- ChangeLog | 3 +++ Completion/Unix/Command/_git | 2 ++ 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 62af20e16..0dbf17111 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,9 @@ * 31863: Completion/Unix/Command/_git: _git: Add new arguments introduced in Git v1.8.4 + * 31862: Completion/Unix/Command/_git: _git: Add status.short and + status.branch + 2013-10-21 m0viefreak * 31856: Completion/Unix/Command/_git: _git: fix a few diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 5b1e71063..eb2da110b 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -2199,6 +2199,8 @@ _git-config () { status.relativePaths:'show paths relative to current directory::->bool:false' status.showUntrackedFiles:'show untracked files::->status.showUntrackedFiles:normal' status.submodulesummary:'include submodule summary::->bool:false' + status.branch:'show branch and tracking info in short format::->bool:false' + status.short:'use short format by default::->bool:false' 'submodule.*.branch:remote branch name for a submodule:branch name:->string' 'submodule.*.fetchRecurseSubmodules:fetch commits of submodules::->bool' 'submodule.*.path:path within project:submodule directory:_directories -qS \:' -- cgit 1.4.1 From 32ffba1214dcc18c4fb39dbad82ed0c6bb3ba41e Mon Sep 17 00:00:00 2001 From: Øystein Walle Date: Sun, 20 Oct 2013 19:43:32 +0200 Subject: 31866: _git: Reword --heads to match new meaning --- ChangeLog | 3 +++ Completion/Unix/Command/_git | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0dbf17111..1821dbb9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,9 @@ * 31862: Completion/Unix/Command/_git: _git: Add status.short and status.branch + * 31866: Completion/Unix/Command/_git: _git: Reword --heads to + match new meaning + 2013-10-21 m0viefreak * 31856: Completion/Unix/Command/_git: _git: fix a few diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index eb2da110b..36e97071e 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -4429,7 +4429,7 @@ _git-show-ref () { - list \ '(-h --head)'{-h,--head}'[show HEAD reference]' \ '--tags[show only refs/tags]' \ - '--heads[show only refs/heads]' \ + '--heads[show only HEAD and refs under refs/heads]' \ '(-d --dereference)'{-d,--dereference}'[dereference tags into object IDs as well]' \ '(-s --hash)'{-s+,--hash=-}'[only show the SHA-1 hash, not the reference name]:: :__git_guard_number length' \ '--verify[enable stricter reference checking]' \ -- cgit 1.4.1 From 3d77fa789d80d361d07ede1c2588500742fc2860 Mon Sep 17 00:00:00 2001 From: Øystein Walle Date: Sun, 20 Oct 2013 19:43:33 +0200 Subject: 31864: _git: Add two sub-comamnds introduced in v1.8.4 Add _git-check-ignore() and _git-check-mailmap() --- ChangeLog | 3 +++ Completion/Unix/Command/_git | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1821dbb9f..f74855eba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,9 @@ * 31866: Completion/Unix/Command/_git: _git: Reword --heads to match new meaning + * 31864: Completion/Unix/Command/_git: _git: Add two sub-comamnds + introduced in v1.8.4 + 2013-10-21 m0viefreak * 31856: Completion/Unix/Command/_git: _git: fix a few diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 36e97071e..0f41acb32 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -399,6 +399,23 @@ _git-bundle () { return ret } +(( $+functions[_git-check-ignore] )) || +_git-check-ignore () { + _arguments \ + '(-q --quiet)'{-q,--quiet}'[do not output anything, just set exit status]' \ + '(-v --verbose)'{-v,--verbose}'[output details about the matching pattern (if any) for each pathname]' \ + '--stdin[read file names from stdin instead of from the command-line]' \ + '-z[make output format machine-parseable]' \ + '(-n --non-matching)'{-n,--non-matching}'[show given paths which do not match any pattern]' \ + '*:: :->file' && ret=0 +} + +(( $+functions[_git-check-mailmap] )) || +_git-check-mailmap () { + _arguments \ + '--stdin[read contacts from stdin after those given on the command line]' +} + (( $+functions[_git-checkout] )) || _git-checkout () { # TODO: __git_tree_ishs is just stupid. It should be giving us a list of tags @@ -5008,6 +5025,8 @@ _git_commands () { local -a plumbing_internal_helper_commands plumbing_internal_helper_commands=( check-attr:'display gitattributes information' + check-ignore:'debug gitignore/exclude files' + check-mailmap:'show canonical names and email addresses of contacts' check-ref-format:'ensure that a reference name is well formed' fmt-merge-msg:'produce merge commit message' mailinfo:'extract patch and authorship from a single email message' -- cgit 1.4.1 From 95a5ca90d9fbc925157471dd38437d8a16b853b1 Mon Sep 17 00:00:00 2001 From: Øystein Walle Date: Sun, 20 Oct 2013 19:43:34 +0200 Subject: 31865: _git: Make --batch(-check) accept an argument Also reword the explanation slightly to make it more compact since more explanation is needed. --- ChangeLog | 3 +++ Completion/Unix/Command/_git | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f74855eba..0f78b8363 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,9 @@ * 31864: Completion/Unix/Command/_git: _git: Add two sub-comamnds introduced in v1.8.4 + * 31865: Completion/Unix/Command/_git: _git: Make --batch(-check) + accept an argument + 2013-10-21 m0viefreak * 31856: Completion/Unix/Command/_git: _git: fix a few diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 0f41acb32..119a705f6 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -4192,8 +4192,8 @@ _git-cat-file () { '(- 1)-e[exit with zero status if object exists]' \ '(- 1)-p[pretty-print given object]' \ '(- 1)--textconv[show content as transformed by a textconv filter]' \ - '(- :)--batch[print SHA1, type, size, and contents of each object provided on stdin]' \ - '(- :)--batch-check[print SHA1, type, and size of each object provided on stdin]' \ + '(- :)--batch=-[print SHA1, type, size and contents (or in ) of objects given on stdin]:format' \ + '(- :)--batch-check=-[print SHA1, type and size (or in ) of objects given on stdin]:format' \ '(-):object type:(blob commit tag tree)' \ ': :__git_objects' } -- cgit 1.4.1