[PATCH] bash: gitk accepts common log-shortlog options

From: SZEDER Gábor <szeder@ira.uka.de>
Date: Jul 21, 2009, 22:20 UTC
Message-ID: <1248214802-2996-1-git-send-email-szeder@ira.uka.de>

Commit a393777e (bash completion: refactor common log, shortlog and gitk options, 2009-02-16) introduced a list of command line options that go well with 'git log' and 'git shortlog' but not with gitk. However, these options are all 'git rev-list' options, and, therefore, are accepted by gitk, too.

This patch moves these options to the list of common options, making them available for gitk option completion, too. Since the list of log-shortlog options becomes empty with this move, this patch deletes it.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
 contrib/completion/git-completion.bash |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index bc2d8b4..f0cd5e3 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1118,6 +1118,8 @@ __git_log_common_options="
 	--max-count=
 	--max-age= --since= --after=
 	--min-age= --until= --before=
+	--author= --committer= --grep=
+	--all-match
 "
 # Options that go well for log and gitk (not shortlog)
 __git_log_gitk_options="
@@ -1125,11 +1127,6 @@ __git_log_gitk_options="
 	--simplify-merges --simplify-by-decoration
 	--left-right
 "
-# Options that go well for log and shortlog (not gitk)
-__git_log_shortlog_options="
-	--author= --committer= --grep=
-	--all-match
-"
 
 __git_log_pretty_formats="oneline short medium full fuller email raw format:"
 __git_log_date_formats="relative iso8601 rfc2822 short local default raw"
@@ -1162,7 +1159,6 @@ _git_log ()
 	--*)
 		__gitcomp "
 			$__git_log_common_options
-			$__git_log_shortlog_options
 			$__git_log_gitk_options
 			--root --topo-order --date-order --reverse
 			--follow --full-diff
@@ -1822,7 +1818,6 @@ _git_shortlog ()
 	--*)
 		__gitcomp "
 			$__git_log_common_options
-			$__git_log_shortlog_options
 			--numbered --summary
 			"
 		return

-- 
1.6.4.rc1.73.ga0daf