Zsh Mailing List Archive Messages sorted by: Reverse Date, Date, Thread, Author

[PATCH] _git-merge: Exclude ancestors of HEAD from recent commit completion

X-seq: zsh-workers 37031
From: Daniel Shahaf <d.s@xxxxxxxxxxxxxxxxxx>
To: zsh-workers@xxxxxxx
Subject: [PATCH] _git-merge: Exclude ancestors of HEAD from recent commit completion
Date: Sat, 31 Oct 2015 12:52:46 +0000
Cc: Mateusz Karbowy <mateusz.karbowy@xxxxxxxxx>
Dkim-signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= daniel.shahaf.name; h=cc:content-type:date:from:message-id :mime-version:subject:to:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=yAq RIx7n9PfHiHlXHSajzJOWF0c=; b=0xV9WBxHsvcBaDOg6MgkcPtlEROaCEXxO45 KTH5HXlYdTUEgHGRJ3JMC8sBsOk3nt2pFlqTviEr1sa+IiMR86BQLt9YrMSiMwr/ N9x+tgx4TOTAcMIu/YuggLLmvpS1IcxZBhENlLj/8Xodx6g853B1Ixlq0peDB38s Hylhhtnk=
Dkim-signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:message-id :mime-version:subject:to:x-sasl-enc:x-sasl-enc; s=smtpout; bh=yA qRIx7n9PfHiHlXHSajzJOWF0c=; b=VJl0zA1uQ12Wilbh1iRVPqFdGrk7CGN0Zj wHpvPkFu9BBcV8HcfpC9lL75u21h4z9hFQU/CawnmgOXOxS4r5caxUjPbXUFQXpk wEpC52L76op7s7M0Q6zKpIIrW4LLXQw2QgV5VzCHRdZrsJ/wTZwrjcinBjMn76my K+uinOEpI=
List-help: <mailto:zsh-workers-help@zsh.org>
List-id: Zsh Workers List <zsh-workers.zsh.org>
List-post: <mailto:zsh-workers@zsh.org>
Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm

As done for _git-cherry-pick in a428c6b62cb2 (36328 + 36340).

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index ad1037e..110f154 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1131,6 +1131,7 @@ _git-log () {
 _git-merge () {
   local -a merge_options
   __git_setup_merge_options
+  local -a git_commit_opts=(--all --not HEAD --not)
 
   _arguments -w -S -s \
     $merge_options \
@@ -1138,7 +1139,7 @@ _git-merge () {
     '(                    --no-rerere-autoupdate)--rerere-autoupdate[allow the rerere mechanism to update the index]' \
     '(--rerere-autoupdate                       )--no-rerere-autoupdate[do not allow the rerere mechanism to update the index]' \
     '--abort[restore the original branch and abort the merge operation]' \
-    '*: :__git_commits'
+    '*: : __git_commits -O expl:git_commit_opts'
 }
 
 (( $+functions[_git-mv] )) ||

Messages sorted by: Reverse Date, Date, Thread, Author