fixup! add an extra level of indirection to main()

2 files changed, 3 insertions, 9 deletions

diff --git a/common-main.c b/common-main.c
index 2b96bbf436..80d59566e3 100644
--- a/common-main.c
+++ b/common-main.c
@@ -1,12 +1,6 @@
 #include "git-compat-util.h"
 
-int main(int argc, char **av)
+int main(int argc, const char **argv)
 {
-	/*
-	 * This const trickery is explained in
-	 * 84d32bf7678259c08406571cd6ce4b7a6724dcba
-	 */
-	const char **argv = (const char **)av;
-
 	return cmd_main(argc, argv);
 }
diff --git a/upload-pack.c b/upload-pack.c
index bcc65a6594..a516b6003d 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -818,7 +818,7 @@ static int upload_pack_config(const char *var, const char *value, void *unused)
 
 int cmd_main(int argc, const char **argv)
 {
-	char *dir;
+	const char *dir;
 	int i;
 	int strict = 0;
 
@@ -829,7 +829,7 @@ int cmd_main(int argc, const char **argv)
 	check_replace_refs = 0;
 
 	for (i = 1; i < argc; i++) {
-		char *arg = argv[i];
+		const char *arg = argv[i];
 
 		if (arg[0] != '-')
 			break;