submodule.c: use GIT_DIR_ENVIRONMENT consistently

stefanbeller · gitster · commit c5f3cba1266d · 2017-01-07T13:10:02.000-08:00
In C code we have the luxury of having constants for all the important
things that are hard coded. This is the only place in C that hard codes
the git directory environment variable, so fix it.

Signed-off-by: Stefan Beller &lt;sbeller@google.com&gt;
Reviewed-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/submodule.c b/submodule.c
@@ -1333,5 +1333,6 @@ void prepare_submodule_repo_env(struct argv_array *out)
 		if (strcmp(*var, CONFIG_DATA_ENVIRONMENT))
 			argv_array_push(out, *var);
 	}
-	argv_array_push(out, "GIT_DIR=.git");
+	argv_array_pushf(out, "%s=%s", GIT_DIR_ENVIRONMENT,
+			 DEFAULT_GIT_DIR_ENVIRONMENT);
 }

Original file line number	Diff line number	Diff line change
`@@ -1333,5 +1333,6 @@ void prepare_submodule_repo_env(struct argv_array *out)`
`1333`	`1333`	`if (strcmp(*var, CONFIG_DATA_ENVIRONMENT))`
`1334`	`1334`	`argv_array_push(out, *var);`
`1335`	`1335`	`}`
`1336`		`- argv_array_push(out, "GIT_DIR=.git");`
	`1336`	`+ argv_array_pushf(out, "%s=%s", GIT_DIR_ENVIRONMENT,`
	`1337`	`+ DEFAULT_GIT_DIR_ENVIRONMENT);`
`1337`	`1338`	`}`