From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 6 Feb 2024 22:31:20 +0000 (-0800)
Subject: Merge branch 'ps/reftable-compacted-tables-permission-fix'
X-Git-Tag: v2.44.0-rc0~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f4e178a4f7ab6dd8758f0b581c5bfe7f71cf415;p=thirdparty%2Fgit.git

Merge branch 'ps/reftable-compacted-tables-permission-fix'

Reftable bugfix.

* ps/reftable-compacted-tables-permission-fix:
  reftable/stack: adjust permissions of compacted tables
---

0f4e178a4f7ab6dd8758f0b581c5bfe7f71cf415
diff --cc reftable/stack.c
index bed25240e3,38e784a8ab..a1dd79fc06
--- a/reftable/stack.c
+++ b/reftable/stack.c
@@@ -849,7 -731,13 +849,13 @@@ static int stack_compact_locked(struct 
  	strbuf_addstr(temp_tab, ".temp.XXXXXX");
  
  	tab_fd = mkstemp(temp_tab->buf);
+ 	if (st->config.default_permissions &&
+ 	    chmod(temp_tab->buf, st->config.default_permissions) < 0) {
+ 		err = REFTABLE_IO_ERROR;
+ 		goto done;
+ 	}
+ 
 -	wr = reftable_new_writer(reftable_fd_write, &tab_fd, &st->config);
 +	wr = reftable_new_writer(reftable_fd_write, reftable_fd_flush, &tab_fd, &st->config);
  
  	err = stack_write_compact(st, wr, first, last, config);
  	if (err < 0)