Merge branch 'sb/submodule-cleanup-export-git-dir-env'

gitster · gitster · commit 8b5b0e8db593 · 2017-01-18T15:12:14.000-08:00
Code cleanup.

* sb/submodule-cleanup-export-git-dir-env:
  submodule.c: use GIT_DIR_ENVIRONMENT consistently
diff --git a/submodule.c b/submodule.c
@@ -1379,7 +1379,8 @@ 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
`@@ -1379,7 +1379,8 @@ void prepare_submodule_repo_env(struct argv_array *out)`
`1379`	`1379`	`if (strcmp(*var, CONFIG_DATA_ENVIRONMENT))`
`1380`	`1380`	`argv_array_push(out, *var);`
`1381`	`1381`	`}`
`1382`		`- argv_array_push(out, "GIT_DIR=.git");`
	`1382`	`+ argv_array_pushf(out, "%s=%s", GIT_DIR_ENVIRONMENT,`
	`1383`	`+ DEFAULT_GIT_DIR_ENVIRONMENT);`
`1383`	`1384`	`}`
`1384`	`1385`
`1385`	`1386`	`/*`