cat-file: avoid "too many arguments"

Running "git cat-file -e a b c d e f g" would fail and say "too many
arguments".  By reading that message, you cannot tell if the command
could have worked if you limited the list of objects to 5 items
instead of 7, or the command is prepared to take only a single item.

Let's report that "b" is an unexpected argument instead.

Signed-off-by: Junio C Hamano <[email protected]>

Author: gitster

builtin/cat-file.c

@@ -1071,10 +1071,13 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
 		else if (!argc && opt_epts)
 			usage_msg_optf(_("<object> required with '-%c'"),
 				       usage, options, opt);
+		else if (!argc)
+			BUG("argc==0 with opt=%c", opt);
 		else if (argc == 1)
 			obj_name = argv[0];
 		else
-			usage_msg_opt(_("too many arguments"), usage, options);
+			usage_msg_optf(_("unexpected argument: '%s'"),
+				       usage, options, argv[1]);
 	} else if (!argc) {
 		usage_with_options(usage, options);
 	} else if (argc != 2) {

t/t1006-cat-file.sh

@@ -66,16 +66,18 @@ do
 	done
 done
 
-test_too_many_arguments () {
+test_unexpected_arg () {
+	unexpected=$1
+	shift
 	test_expect_code 129 "$@" 2>err &&
-	grep -E "^fatal: too many arguments$" err
+	grep -E "^fatal: unexpected argument: '$unexpected'" err
 }
 
 for opt in $short_modes $cw_modes
 do
 	args="one two three"
 	test_expect_success "usage: too many arguments: $opt $args" '
-		test_too_many_arguments git cat-file $opt $args
+		test_unexpected_arg two git cat-file $opt $args
 	'
 
 	for opt2 in --buffer --follow-symlinks