  			/*
  			 * Do not even bother with the return value; we know we
 diff -ru source/setup.c source-new/setup.c
---- source/setup.c	2017-06-04 18:08:11.000000000 -0700
-+++ source-new/setup.c	2017-08-15 13:29:42.359635956 -0700
-@@ -1157,7 +1157,7 @@
+--- source/setup.c	2017-06-04 19:08:11.000000000 -0600
++++ source-new/setup.c	2018-12-02 14:19:36.749210959 -0700
+@@ -1143,21 +1143,21 @@
+ 	return read_gitfile_gently(suspect, return_error_code);
+ }
+ 
+-/* if any standard file descriptor is missing open it to /dev/null */
++/* if any standard file descriptor is missing open it to null: */
+ void sanitize_stdfds(void)
+ {
+-	int fd = open("/dev/null", O_RDWR, 0);
++	int fd = open("null:", O_RDWR, 0);
+ 	while (fd != -1 && fd < 2)
+ 		fd = dup(fd);
+ 	if (fd == -1)
+-		die_errno("open /dev/null or dup failed");
++		die_errno("open null: or dup failed");
+ 	if (fd > 2)
+ 		close(fd);
+ }
  
  int daemonize(void)
  {

 
 int main(int argc, const char **argv)
diff -ru source/compat/hstrerror.c source-new/compat/hstrerror.c
--- source/compat/hstrerror.c	2017-06-04 18:08:11.000000000 -0700
+++ source-new/compat/hstrerror.c	2017-08-15 13:29:42.346302539 -0700
@@ -5,17 +5,6 @@
 const char *githstrerror(int err)
 {

 			      rerere_path(id, "postimage"));
 
diff -ru source/run-command.c source-new/run-command.c
--- source/run-command.c	2017-06-04 19:08:11.000000000 -0600
+++ source-new/run-command.c	2018-12-02 14:18:59.804197591 -0700
@@ -138,7 +138,7 @@
 		return NULL;
 
