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>
git-mirror · Oct 10, 2011 · e67d71e · e67d71e
1 parent a8f89bf
commit e67d71e
Showing 1 changed file with 4 additions and 14 deletions.
diff --git 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
 		;;
 	--*)