]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/reftable-compacted-tables-permission-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Feb 2024 22:31:20 +0000 (14:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Feb 2024 22:31:20 +0000 (14:31 -0800)
Reftable bugfix.

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

1  2 
reftable/stack.c

index bed25240e3d220e6c3a52bddf4ff1ec2695ad7a7,38e784a8abb835e28af1dc90b55d5c6c118b9a91..a1dd79fc06160004148f1bb610709d07e139b295
@@@ -849,7 -731,13 +849,13 @@@ static int stack_compact_locked(struct 
        strbuf_addstr(temp_tab, ".temp.XXXXXX");
  
        tab_fd = mkstemp(temp_tab->buf);
 -      wr = reftable_new_writer(reftable_fd_write, &tab_fd, &st->config);
+       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, reftable_fd_flush, &tab_fd, &st->config);
  
        err = stack_write_compact(st, wr, first, last, config);
        if (err < 0)