From: SZEDER Gábor <szeder@ira.uka.de>
Date: Sat, 8 Oct 2011 01:09:34 +0000 (+0200)
Subject: completion: unite --format and --pretty for 'log' and 'show'
X-Git-Tag: v1.7.8-rc0~55^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e67d71e559724eacb6a799f8be42058da52a8580;p=git.git

completion: unite --format and --pretty for 'log' and 'show'

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 4a857b680..5c649c6f4 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1604,14 +1604,9 @@ _git_log ()
 	local cur
 	_get_comp_words_by_ref -n =: cur
 	case "$cur" in
-	--pretty=*)
+	--pretty=*|--format=*)
 		__gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases)
-			" "" "${cur##--pretty=}"
-		return
-		;;
-	--format=*)
-		__gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases)
-			" "" "${cur##--format=}"
+			" "" "${cur#*=}"
 		return
 		;;
 	--date=*)
@@ -2456,14 +2451,9 @@ _git_show ()
 	local cur
 	_get_comp_words_by_ref -n =: cur
 	case "$cur" in
-	--pretty=*)
-		__gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases)
-			" "" "${cur##--pretty=}"
-		return
-		;;
-	--format=*)
+	--pretty=*|--format=*)
 		__gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases)
-			" "" "${cur##--format=}"
+			" "" "${cur#*=}"
 		return
 		;;
 	--*)