zsh-workers
 help / color / mirror / code / Atom feed
From: "Mikael Magnusson" <mikachu@gmail.com>
To: zsh-workers <zsh-workers@sunsite.dk>
Cc: "Nikolai Weibull" <now@bitwi.se>, "Clint Adams" <clint@zsh.org>
Subject: Make git-commit complete both modified files and git-added files.
Date: Thu, 4 Oct 2007 03:05:40 +0200	[thread overview]
Message-ID: <237967ef0710031805r1124449dmc4c55e7545a81e0a@mail.gmail.com> (raw)

This is useful when you've git-added two or more files, but you only
want to commit one of them.
http://git.mikachu.ath.cx/?p=zsh-cvs.git;a=commitdiff_plain;h=commit

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 3771da1..dfb9655 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1568,7 +1568,7 @@ _git-commit () {
     '(-q --quiet -v --verbose)'{-q,--quiet}'[suppress commit summary
message]' \
     '(-q --quiet -v --verbose)'{-v,--verbose}'[show unified diff of
all file changes]' \
     '(-u --untracked-files)'{-u,--untracked-files}'[show files in
untracked directories]' \
-    '*:file:__git_modified_files' \
+    '*:file:__git_changed_files' \
     - '(message)' \
       '--amend[amend the tip of the current branch]' \
       {-c,--reedit-message=}'[use existing commit object and edit log
message]:commit:__git_commits' \
@@ -2624,6 +2624,18 @@ __git_unmerged_files () {
   __git_files $* --unmerged
 }

+#this is for git-commit which can take files both git-added and not
+(( $+functions[__git_changed_files] )) ||
+__git_changed_files () {
+  gitdir=$(_call_program gitdir git rev-parse --git-dir 2>/dev/null)
+  __git_command_successful || return
+
+  files=(${(ps:\0:)"$(_call_program files git diff-index -z
--name-only HEAD 2>/dev/null)"})
+  __git_command_successful || return
+
+  _wanted files expl 'index file' _multi_parts $@ - / files
+}
+
 (( $+functions[__git_tree_files] )) ||
 __git_tree_files () {
   local multi_parts_opts

-- 
Mikael Magnusson


             reply	other threads:[~2007-10-04  1:05 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-04  1:05 Mikael Magnusson [this message]
2007-10-04  8:05 ` Nikolai Weibull
2007-10-04  8:27   ` Clint Adams

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=237967ef0710031805r1124449dmc4c55e7545a81e0a@mail.gmail.com \
    --to=mikachu@gmail.com \
    --cc=clint@zsh.org \
    --cc=now@bitwi.se \
    --cc=zsh-workers@sunsite.dk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).