Merge branch 'ps/fsync-refs-fix' into maint-2.39

gitster · gitster · commit 259988af42ca · 2023-02-14T14:15:50.000-08:00
Fix the sequence to fsync $GIT_DIR/packed-refs file that forgot to
flush its output to the disk..

* ps/fsync-refs-fix:
  refs: fix corruption by not correctly syncing packed-refs to disk
diff --git a/refs/packed-backend.c b/refs/packed-backend.c
@@ -1263,7 +1263,8 @@ static int write_with_updates(struct packed_ref_store *refs,
 		goto error;
 	}
 
-	if (fsync_component(FSYNC_COMPONENT_REFERENCE, get_tempfile_fd(refs->tempfile)) ||
+	if (fflush(out) ||
+	    fsync_component(FSYNC_COMPONENT_REFERENCE, get_tempfile_fd(refs->tempfile)) ||
 	    close_tempfile_gently(refs->tempfile)) {
 		strbuf_addf(err, "error closing file %s: %s",
 			    get_tempfile_path(refs->tempfile),

Original file line number	Diff line number	Diff line change
`@@ -1263,7 +1263,8 @@ static int write_with_updates(struct packed_ref_store *refs,`
`1263`	`1263`	`goto error;`
`1264`	`1264`	`}`
`1265`	`1265`
`1266`		`- if (fsync_component(FSYNC_COMPONENT_REFERENCE, get_tempfile_fd(refs->tempfile)) \|\|`
	`1266`	`+ if (fflush(out) \|\|`
	`1267`	`+ fsync_component(FSYNC_COMPONENT_REFERENCE, get_tempfile_fd(refs->tempfile)) \|\|`
`1267`	`1268`	`close_tempfile_gently(refs->tempfile)) {`
`1268`	`1269`	`strbuf_addf(err, "error closing file %s: %s",`
`1269`	`1270`	`get_tempfile_path(refs->tempfile),`