From 4fa7c6aeccf19442e59740d388db5066cb30f3fc Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 9 Apr 2017 17:18:23 +0200 Subject: 40943: __git_recent_commits: prefer recent commit objects Without this "commit to be amended" shows up before "recent commit object name" with `git commit --fixup`, but the recent commit objects are the most useful here. --- ChangeLog | 5 +++++ Completion/Unix/Command/_git | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index cef83e09c..87721928a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-04-23 Daniel Hahler + + * 40943: Completion/Unix/Command/_git: __git_recent_commits: prefer + recent commit objects. + 2017-04-23 Peter Stephenson * 40995: Src/lex.c, Test/D08cmdsubst.ztst: we need to expand diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 85aac9264..a46e3b55d 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -6326,11 +6326,11 @@ __git_recent_commits () { ret=1 # Resetting expl to avoid it 'leaking' from one line to the next. expl=() + _describe -V -t commits 'recent commit object name' descr && ret=0 + expl=() _wanted commit-tags expl 'commit tag' compadd "$@" -a - tags && ret=0 expl=() _wanted heads expl 'head' compadd "$@" -a - heads && ret=0 - expl=() - _describe -V -t commits 'recent commit object name' descr && ret=0 return $ret } -- cgit 1.4.1