tmp-objdir: put quarantine information in the environment

peff · gitster · commit e34c2e010f86 · 2016-10-10T13:54:02.000-07:00
The presence of the GIT_QUARANTINE_PATH variable lets any
called programs know that they're operating in a temporary
object directory (and where that directory is).

Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/cache.h b/cache.h
@@ -433,6 +433,7 @@ static inline enum object_type object_type(unsigned int mode)
 #define GIT_GLOB_PATHSPECS_ENVIRONMENT "GIT_GLOB_PATHSPECS"
 #define GIT_NOGLOB_PATHSPECS_ENVIRONMENT "GIT_NOGLOB_PATHSPECS"
 #define GIT_ICASE_PATHSPECS_ENVIRONMENT "GIT_ICASE_PATHSPECS"
+#define GIT_QUARANTINE_ENVIRONMENT "GIT_QUARANTINE_PATH"
 
 /*
  * This environment variable is expected to contain a boolean indicating
diff --git a/tmp-objdir.c b/tmp-objdir.c
@@ -147,6 +147,8 @@ struct tmp_objdir *tmp_objdir_create(void)
 	env_append(&t->env, ALTERNATE_DB_ENVIRONMENT,
 		   absolute_path(get_object_directory()));
 	env_replace(&t->env, DB_ENVIRONMENT, absolute_path(t->path.buf));
+	env_replace(&t->env, GIT_QUARANTINE_ENVIRONMENT,
+		    absolute_path(t->path.buf));
 
 	return t;
 }

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,8 @@ struct tmp_objdir *tmp_objdir_create(void)`
`147`	`147`	`env_append(&t->env, ALTERNATE_DB_ENVIRONMENT,`
`148`	`148`	`absolute_path(get_object_directory()));`
`149`	`149`	`env_replace(&t->env, DB_ENVIRONMENT, absolute_path(t->path.buf));`
	`150`	`+ env_replace(&t->env, GIT_QUARANTINE_ENVIRONMENT,`
	`151`	`+ absolute_path(t->path.buf));`
`150`	`152`
`151`	`153`	`return t;`
`152`	`154`	`}`