commit 08c39ec3233041ae39f4885f95162af964a1c19c8c6cff6c8ed5e357cb893d5e from: Stefan Sperling date: Wed May 20 20:54:01 2026 UTC repair gotsysd build after network sha256 changes commit - 3de97fadcf85613d1d2b0cfc4e84fd11eaec1c63ef96cacfbf264a12d1db69d3 commit + 08c39ec3233041ae39f4885f95162af964a1c19c8c6cff6c8ed5e357cb893d5e blob - 079721cb7cc48f42071b188ccc0c4a03228e660e58426530c576a58253ede6dd blob + 9af5a08a0f179b7b46777d1f07eae8fb231310633262a60bf46eb301e00b9da1 --- cvg/Makefile +++ cvg/Makefile @@ -16,8 +16,9 @@ SRCS= cvg.c blame.c commit_graph.c delta.c diff.c \ bloom.c murmurhash2.c ratelimit.c patch.c sigs.c date.c \ object_open_privsep.c read_gitconfig_privsep.c \ read_gotconfig_privsep.c pack_create_privsep.c pollfd.c \ - reference_parse.c object_qid.c repository_init.c - + reference_parse.c object_qid.c repository_init.c \ + repository_gitconfig.c + MAN = ${PROG}.1 CPPFLAGS = -I${.CURDIR}/../include -I${.CURDIR}/../lib blob - 38559e78fb9b32e0b0e77b57b7c0f677a88287f64b364cd5a1d41aceca22bfd6 blob + 29b67177e690c7fb0a0407539d031c406421644ee9c22f9f7f63dfbe0c2eafa4 --- got/Makefile +++ got/Makefile @@ -16,7 +16,8 @@ SRCS= got.c blame.c commit_graph.c delta.c diff.c \ bloom.c murmurhash2.c ratelimit.c patch.c sigs.c date.c \ object_open_privsep.c read_gitconfig_privsep.c \ read_gotconfig_privsep.c pack_create_privsep.c pollfd.c \ - reference_parse.c object_qid.c repository_init.c + reference_parse.c object_qid.c repository_init.c \ + repository_gitconfig.c MAN = ${PROG}.1 got-worktree.5 git-repository.5 got.conf.5 blob - 3356459adb34f5cf56ffaf9d087c1e4d3ee60705676838beeb896aa070a5ccd1 blob + 41a27a88fd38dfd52017bb02b7f8c206ff7d7eb6eb04de37391caf327aef0bf1 --- gotadmin/Makefile +++ gotadmin/Makefile @@ -12,7 +12,7 @@ SRCS= gotadmin.c \ sigs.c buf.c date.c object_open_privsep.c \ read_gitconfig_privsep.c read_gotconfig_privsep.c \ pack_create_privsep.c pollfd.c reference_parse.c object_qid.c \ - dump.c load.c repository_init.c + dump.c load.c repository_init.c repository_gitconfig.c MAN = ${PROG}.1 CPPFLAGS = -I${.CURDIR}/../include -I${.CURDIR}/../lib blob - c5415b1d65b230837404386531e0fbd7885596b7c33dfee2f89579540408ae49 blob + 10e8e2766b12ae0cf675b6fcd76288171eec257abe0009fb32c64467e852d592 --- gotd/Makefile +++ gotd/Makefile @@ -22,7 +22,7 @@ SRCS= gotd.c auth.c repo_read.c repo_write.c log.c pr object_qid.c notify.c commit_graph.c diffreg.c diff.c \ diff_main.c diff_atomize_text.c diff_myers.c diff_output.c \ diff_output_plain.c diff_output_unidiff.c \ - diff_output_edscript.c diff_patience.c + diff_output_edscript.c diff_patience.c repository_gitconfig.c CLEANFILES = parse.h blob - 421878dfc9c0c17cc766f3b2c15d3f5afccaeab7696675876670c3f9e99d131d blob + ee145d64f337f23e758093a32220b0f95058e9fc8dee831f56b82d44fd5bc49c --- gotd/libexec/gotsys-apply/Makefile +++ gotd/libexec/gotsys-apply/Makefile @@ -10,7 +10,7 @@ SRCS= gotsys-apply.c bloom.c buf.c date.c deflate.c de object_create.c object_idset.c object_open_io.c object_parse.c \ object_qid.c opentemp.c pack.c path.c pollfd.c privsep_stub.c \ read_gitconfig.c read_gotconfig.c reference.c reference_parse.c \ - repository.c sigs.c media.c + repository.c sigs.c media.c repository_gitconfig.c NOMAN = Yes blob - 88b41d09ce6588d6fe7a55c1d101f8cc1b832acdaf8eb4b1ed5454bc147d8620 blob + 3eb00217dca75490dd7de57493fed92c1e52ae8892b36e28a15252ceb333f595 --- gotsys/Makefile +++ gotsys/Makefile @@ -9,7 +9,7 @@ SRCS= gotsys.c gotsys_conf.c bloom.c buf.c date.c defl object_create.c object_idset.c object_open_io.c object_parse.c \ object_qid.c opentemp.c pack.c parse.y path.c pollfd.c \ privsep_stub.c read_gitconfig.c read_gotconfig.c reference.c \ - reference_parse.c repository.c sigs.c media.c + reference_parse.c repository.c sigs.c media.c repository_gitconfig.c MAN = ${PROG}.1 ${PROG}.conf.5 blob - c35c1aab1af9f6052a902437fc6995d81b0f7827312b9c12b58eaffdded99e51 blob + ef0220bfb02f0da8584471cb3243585ff430e0009f5f610cb0db99126197100d --- gotsysd/libexec/gotsys-repo-create/Makefile +++ gotsysd/libexec/gotsys-repo-create/Makefile @@ -5,7 +5,8 @@ PROG= gotsys-repo-create SRCS= gotsys-repo-create.c error.c hash.c pollfd.c path.c \ imsg.c gotsys_conf.c media.c gotsys_imsg.c repository_init.c \ - reference_parse.c lockfile.c + reference_parse.c lockfile.c repository_gitconfig.c \ + read_gitconfig.c gitconfig.c CPPFLAGS = -I${.CURDIR}/../../../include -I${.CURDIR}/../../../lib \ -I${.CURDIR}/../../../gotsys -I${.CURDIR}/../../../gotwebd \ blob - 5920d994f539cead28b92e618e43d18f0bc56b2c7ff78d5d16e50711b9b9d78b blob + 0ad6a0c5ebc4114831762cef0a7bfec5373246a1578179bef788b1b62dbd76ca --- gotwebd/Makefile +++ gotwebd/Makefile @@ -19,7 +19,7 @@ SRCS += blame.c commit_graph.c delta.c diff.c \ sigs.c date.c \ object_open_privsep.c read_gitconfig_privsep.c \ read_gotconfig_privsep.c pollfd.c reference_parse.c \ - object_qid.c log.c + object_qid.c log.c repository_gitconfig.c .if exists(${.CURDIR}/../template/obj/template) TEMPLATE = ${.CURDIR}/../template/obj/template blob - 2b6c47f509ad02c4fc6746d0210f7723c474aae030a975f69389fe5249b71a5b blob + 3a65fab6230f0452a43cb75b10745ee316103b95015f05cf8323f16786907f2c --- lib/repository.c +++ lib/repository.c @@ -844,24 +844,6 @@ done: return err; } -void -got_repo_free_gitconfig(struct got_repository *repo) -{ - size_t i; - - free(repo->gitconfig_author_name); - free(repo->gitconfig_author_email); - for (i = 0; i < repo->ngitconfig_remotes; i++) - got_repo_free_remote_repo_data(&repo->gitconfig_remotes[i]); - free(repo->gitconfig_remotes); - for (i = 0; i < repo->nextensions; i++) { - free(repo->extnames[i]); - free(repo->extvals[i]); - } - free(repo->extnames); - free(repo->extvals); -} - const struct got_error * got_repo_close(struct got_repository *repo) { @@ -1032,37 +1014,6 @@ done: return err; } -void -got_repo_free_remote_repo_data(struct got_remote_repo *repo) -{ - int i; - - if (repo == NULL) - return; - - free(repo->name); - repo->name = NULL; - free(repo->fetch_url); - repo->fetch_url = NULL; - free(repo->send_url); - repo->send_url = NULL; - for (i = 0; i < repo->nfetch_branches; i++) - free(repo->fetch_branches[i]); - free(repo->fetch_branches); - repo->fetch_branches = NULL; - repo->nfetch_branches = 0; - for (i = 0; i < repo->nsend_branches; i++) - free(repo->send_branches[i]); - free(repo->send_branches); - repo->send_branches = NULL; - repo->nsend_branches = 0; - for (i = 0; i < repo->nfetch_refs; i++) - free(repo->fetch_refs[i]); - free(repo->fetch_refs); - repo->fetch_refs = NULL; - repo->nfetch_refs = 0; -} - const struct got_error * got_repo_map_path(char **in_repo_path, struct got_repository *repo, const char *input_path) blob - 35e6738938073e64f309062d1849acf02cd994d8212aad669bf14493fc912aba blob + 329b6ee9661b45ee1302b1fa92331a77db83bcead5ef5c83289ecf5993b22b3a --- lib/repository_init.c +++ lib/repository_init.c @@ -129,9 +129,8 @@ got_repo_init_gitconfig(struct got_repository *repo, const struct got_error *err; char *path; - path = got_repo_get_path_gitconfig(repo); - if (path == NULL) - return got_error_from_errno("got_repo_get_path_gitconfig"); + if (asprintf(&path, "%s/%s", repo->path_git_dir, GOT_GITCONFIG) == -1) + return NULL; if (unlink(path) == -1) { err = got_error_from_errno2("unlink", path); blob - /dev/null blob + cf55c2c5114b309fe80e60ad8c6014aa1b4314ef1395107d7d0f503f0ff60c6e (mode 644) --- /dev/null +++ lib/repository_gitconfig.c @@ -0,0 +1,88 @@ +/* + * Copyright (c) 2026 Stefan Sperling + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include + +#include +#include +#include +#include +#include +#include +#include + +#include "got_error.h" +#include "got_repository.h" +#include "got_path.h" +#include "got_object.h" + +#include "got_lib_delta.h" +#include "got_lib_hash.h" +#include "got_lib_object.h" +#include "got_lib_pack.h" +#include "got_lib_privsep.h" +#include "got_lib_object_cache.h" +#include "got_lib_repository.h" + +void +got_repo_free_remote_repo_data(struct got_remote_repo *repo) +{ + int i; + + if (repo == NULL) + return; + + free(repo->name); + repo->name = NULL; + free(repo->fetch_url); + repo->fetch_url = NULL; + free(repo->send_url); + repo->send_url = NULL; + for (i = 0; i < repo->nfetch_branches; i++) + free(repo->fetch_branches[i]); + free(repo->fetch_branches); + repo->fetch_branches = NULL; + repo->nfetch_branches = 0; + for (i = 0; i < repo->nsend_branches; i++) + free(repo->send_branches[i]); + free(repo->send_branches); + repo->send_branches = NULL; + repo->nsend_branches = 0; + for (i = 0; i < repo->nfetch_refs; i++) + free(repo->fetch_refs[i]); + free(repo->fetch_refs); + repo->fetch_refs = NULL; + repo->nfetch_refs = 0; +} + +void +got_repo_free_gitconfig(struct got_repository *repo) +{ + size_t i; + + free(repo->gitconfig_author_name); + free(repo->gitconfig_author_email); + for (i = 0; i < repo->ngitconfig_remotes; i++) + got_repo_free_remote_repo_data(&repo->gitconfig_remotes[i]); + free(repo->gitconfig_remotes); + for (i = 0; i < repo->nextensions; i++) { + free(repo->extnames[i]); + free(repo->extvals[i]); + } + free(repo->extnames); + free(repo->extvals); +} + blob - f6ee73f510489d25c7f7117054d1b114a69c1a32c2390c01cab44bb0eee5ece3 blob + b54fa52ab6163f7df775d681382363914b0e7842556062dc5e829c1039d5e47c --- regress/Makefile +++ regress/Makefile @@ -1,4 +1,4 @@ -SUBDIR = cmdline delta deltify idset path fetch tog secrets +SUBDIR = delta deltify idset path fetch tog secrets .if make(clean) || make(obj) SUBDIR += gotd gotwebd gotsysd blob - 153911a89298c9c7d5086e1f6c34a36bbb261d5a9c88fc15e0e504d205230fa6 blob + f5de389b1b168cc022a09dec0e680017cff72f34a526fc975c822421432ec77b --- regress/fetch/Makefile +++ regress/fetch/Makefile @@ -6,7 +6,8 @@ SRCS = error.c privsep.c reference.c hash.c object.c o deflate.c delta.c delta_cache.c object_idset.c object_create.c \ fetch.c gotconfig.c dial.c fetch_test.c bloom.c murmurhash2.c sigs.c \ buf.c date.c object_open_privsep.c read_gitconfig_privsep.c \ - read_gotconfig_privsep.c pollfd.c reference_parse.c object_qid.c + read_gotconfig_privsep.c pollfd.c reference_parse.c object_qid.c \ + repository_gitconfig.c CPPFLAGS = -I${.CURDIR}/../../include -I${.CURDIR}/../../lib LDADD = -lutil -lz -lm blob - 17b010ea79e281112266b7c7f9034ef070089c636af79d43fd4e7fac3ab215a5 blob + 3d6932e71587f517403413a399ded446602b1a204e55e9001e6c5e10b4adf11a --- tog/Makefile +++ tog/Makefile @@ -15,7 +15,7 @@ SRCS= tog.c blame.c commit_graph.c delta.c diff.c \ diff_patience.c bloom.c murmurhash2.c sigs.c date.c \ object_open_privsep.c read_gitconfig_privsep.c \ read_gotconfig_privsep.c pollfd.c reference_parse.c \ - object_qid.c keyword.c + object_qid.c keyword.c repository_gitconfig.c MAN = ${PROG}.1 CPPFLAGS = -I${.CURDIR}/../include -I${.CURDIR}/../lib