From: Daniel Sonbolian <dsal3389@gmail.com>
Date: Sat, 8 Oct 2022 16:21:37 +0000 (+0000)
Subject: git.c: improve code readability in cmd_main()
X-Git-Tag: v2.39.0-rc0~90^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=413bc6d20ad4d686f68afcf3c012b77840c1243b;p=thirdparty%2Fgit.git

git.c: improve code readability in cmd_main()

Check for an error condition whose body unconditionally exists
first, and then perform the special casing of "version" and "help"
as part of the preparation for the "normal codepath".  This makes
the code simpler to read.

Signed-off-by: Daniel Sonbolian <dsal3389@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git.c b/git.c
index d7a7a82008..a10fe447b1 100644
--- a/git.c
+++ b/git.c
@@ -893,12 +893,8 @@ int cmd_main(int argc, const char **argv)
 	argv++;
 	argc--;
 	handle_options(&argv, &argc, NULL);
-	if (argc > 0) {
-		if (!strcmp("--version", argv[0]) || !strcmp("-v", argv[0]))
-			argv[0] = "version";
-		else if (!strcmp("--help", argv[0]) || !strcmp("-h", argv[0]))
-			argv[0] = "help";
-	} else {
+
+	if (!argc) {
 		/* The user didn't specify a command; give them help */
 		commit_pager_choice();
 		printf(_("usage: %s\n\n"), git_usage_string);
@@ -906,6 +902,12 @@ int cmd_main(int argc, const char **argv)
 		printf("\n%s\n", _(git_more_info_string));
 		exit(1);
 	}
+
+	if (!strcmp("--version", argv[0]) || !strcmp("-v", argv[0]))
+		argv[0] = "version";
+	else if (!strcmp("--help", argv[0]) || !strcmp("-h", argv[0]))
+		argv[0] = "help";
+
 	cmd = argv[0];
 
 	/*