Merge branch 'tb/receive-pack-code-cleanup'

gitster · gitster · commit 3846c2a1edce · 2022-05-25T16:42:49.000-07:00
Code clean-up.

* tb/receive-pack-code-cleanup:
  builtin/receive-pack.c: remove redundant 'if'
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
@@ -2214,8 +2214,7 @@ static const char *unpack(int err_fd, struct shallow_info *si)
 			close(err_fd);
 		return "unable to create temporary object directory";
 	}
-	if (tmp_objdir)
-		strvec_pushv(&child.env_array, tmp_objdir_env(tmp_objdir));
+	strvec_pushv(&child.env_array, tmp_objdir_env(tmp_objdir));
 
 	/*
 	 * Normally we just pass the tmp_objdir environment to the child

Original file line number	Diff line number	Diff line change
`@@ -2214,8 +2214,7 @@ static const char unpack(int err_fd, struct shallow_info si)`
`2214`	`2214`	`close(err_fd);`
`2215`	`2215`	`return "unable to create temporary object directory";`
`2216`	`2216`	`}`
`2217`		`- if (tmp_objdir)`
`2218`		`- strvec_pushv(&child.env_array, tmp_objdir_env(tmp_objdir));`
	`2217`	`+ strvec_pushv(&child.env_array, tmp_objdir_env(tmp_objdir));`
`2219`	`2218`
`2220`	`2219`	`/*`
`2221`	`2220`	`* Normally we just pass the tmp_objdir environment to the child`