summary refs log tree commit diff
diff options
context:
space:
mode:
authorØystein Walle <oystwa@gmail.com>2013-10-20 19:41:01 +0200
committerFrank Terbeck <ft@bewatermyfriend.org>2013-10-21 17:39:50 +0200
commit5585b95f3c65d87f698234a781552b006b56e930 (patch)
tree20f0d8e8f1ad339a2a4144d2cd53af8e6fb1b4b8
parent7872a5becdc3ead1d8ea809bfe88b8d9a0b4b599 (diff)
downloadzsh-5585b95f3c65d87f698234a781552b006b56e930.tar.gz
zsh-5585b95f3c65d87f698234a781552b006b56e930.tar.xz
zsh-5585b95f3c65d87f698234a781552b006b56e930.zip
31859: _git: re-order the last two git-blame arguments
The proper syntax is git blame [<commit>] <file> where <commit> is optional.
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_git4
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  <p.w.stephenson@ntlworld.com>
 
 	* 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)