[PATCH 6/6] merge: remove deprecated summary and diffstat options and config variables

["SZEDER Gábor" <szeder@ira.uka.de>]

Also remove them from 'pull' and 'fmt-merge-msg'.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
 builtin-fmt-merge-msg.c |   12 +++---------
 git-merge.sh            |    5 ++---
 git-pull.sh             |    4 ++--
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c
index d49f545..0bf87c1 100644
--- a/builtin-fmt-merge-msg.c
+++ b/builtin-fmt-merge-msg.c
@@ -12,12 +12,7 @@ static int merge_summary;
 
 static int fmt_merge_msg_config(const char *key, const char *value)
 {
-	static int found_merge_log = 0;
-	if (!strcmp("merge.log", key)) {
-		found_merge_log = 1;
-		merge_summary = git_config_bool(key, value);
-	}
-	if (!found_merge_log && !strcmp("merge.summary", key))
+	if (!strcmp("merge.log", key))
 		merge_summary = git_config_bool(key, value);
 	return 0;
 }
@@ -255,10 +250,9 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
 	git_config(fmt_merge_msg_config);
 
 	while (argc > 1) {
-		if (!strcmp(argv[1], "--log") || !strcmp(argv[1], "--summary"))
+		if (!strcmp(argv[1], "--log"))
 			merge_summary = 1;
-		else if (!strcmp(argv[1], "--no-log")
-				|| !strcmp(argv[1], "--no-summary"))
+		else if (!strcmp(argv[1], "--no-log"))
 			merge_summary = 0;
 		else if (!strcmp(argv[1], "-F") || !strcmp(argv[1], "--file")) {
 			if (argc < 3)
diff --git a/git-merge.sh b/git-merge.sh
index a903e2b..db79851 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -150,9 +150,9 @@ merge_name () {
 parse_config () {
 	while test $# != 0; do
 		case "$1" in
-		-n|--no-stat|--no-summary)
+		-n|--no-stat)
 			show_diffstat=false ;;
-		--stat|--summary)
+		--stat)
 			show_diffstat=t ;;
 		--log|--no-log)
 			log_arg=$1 ;;
@@ -213,7 +213,6 @@ parse_config "$@"
 while test $args_left -lt $#; do shift; done
 
 if test -z "$show_diffstat"; then
-    test "$(git config --bool merge.diffstat)" = false && show_diffstat=false
     test "$(git config --bool merge.stat)" = false && show_diffstat=false
     test -z "$show_diffstat" && show_diffstat=t
 fi
diff --git a/git-pull.sh b/git-pull.sh
index bf0c298..11d37a6 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -23,9 +23,9 @@ rebase=$(git config --bool branch.$curr_branch_short.rebase)
 while :
 do
 	case "$1" in
-	-n|--no-stat|--no-summary)
+	-n|--no-stat)
 		no_stat=-n ;;
-	--stat|--summary)
+	--stat)
 		no_stat=$1 ;;
 	--log|--no-log)
 		log_arg=$1 ;;
-- 
1.5.5.rc3.9.gba703