Merge branch 'tb/pack-revindex-on-disk'

gitster · gitster · commit 074d162eff74 · 2021-03-14T16:01:41.000-07:00
Fix for a topic in 'master'.

* tb/pack-revindex-on-disk:
  pack-revindex.c: don't close unopened file descriptors
diff --git a/pack-revindex.c b/pack-revindex.c
@@ -253,7 +253,8 @@ static int load_revindex_from_disk(char *revindex_name,
 		*data_p = (const uint32_t *)data;
 	}
 
-	close(fd);
+	if (fd >= 0)
+		close(fd);
 	return ret;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,8 @@ static int load_revindex_from_disk(char *revindex_name,`
`253`	`253`	`data_p = (const uint32_t )data;`
`254`	`254`	`}`
`255`	`255`
`256`		`- close(fd);`
	`256`	`+ if (fd >= 0)`
	`257`	`+ close(fd);`
`257`	`258`	`return ret;`
`258`	`259`	`}`
`259`	`260`