undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ps/receive-pack-unlock-before-die'

Browse Source 
"git receive-pack" that responds to "git push" requests failed to
clean a stale lockfile when killed in the middle, which has been
corrected.

* ps/receive-pack-unlock-before-die:
  receive-pack: fix stale packfile locks when dying
This commit is contained in:
Junio C Hamano 2023-03-21 14:18:55 -07:00
commit ea09dff59a
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
builtin/receive-pack.c
View File

@ -2183,7 +2183,7 @@ static const char *parse_pack_header(struct pack_header *hdr)
} }
} }
static const char *pack_lockfile; static struct tempfile *pack_lockfile;
static void push_header_arg(struct strvec *args, struct pack_header *hdr) static void push_header_arg(struct strvec *args, struct pack_header *hdr)
{ {
@ -2250,6 +2250,7 @@ static const char *unpack(int err_fd, struct shallow_info *si)
return "unpack-objects abnormal exit"; return "unpack-objects abnormal exit";
} else { } else {
char hostname[HOST_NAME_MAX + 1]; char hostname[HOST_NAME_MAX + 1];
char *lockfile;
strvec_pushl(&child.args, "index-pack", "--stdin", NULL); strvec_pushl(&child.args, "index-pack", "--stdin", NULL);
push_header_arg(&child.args, &hdr); push_header_arg(&child.args, &hdr);
@ -2279,8 +2280,14 @@ static const char *unpack(int err_fd, struct shallow_info *si)
status = start_command(&child); status = start_command(&child);
if (status) if (status)
return "index-pack fork failed"; return "index-pack fork failed";
pack_lockfile = index_pack_lockfile(child.out, NULL);
lockfile = index_pack_lockfile(child.out, NULL);
if (lockfile) {
pack_lockfile = register_tempfile(lockfile);
free(lockfile);
}
close(child.out); close(child.out);
status = finish_command(&child); status = finish_command(&child);
if (status) if (status)
return "index-pack abnormal exit"; return "index-pack abnormal exit";
@ -2567,8 +2574,7 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
use_keepalive = KEEPALIVE_ALWAYS; use_keepalive = KEEPALIVE_ALWAYS;
execute_commands(commands, unpack_status, &si, execute_commands(commands, unpack_status, &si,
&push_options); &push_options);
if (pack_lockfile) delete_tempfile(&pack_lockfile);
unlink_or_warn(pack_lockfile);
sigchain_push(SIGPIPE, SIG_IGN); sigchain_push(SIGPIPE, SIG_IGN);
if (report_status_v2) if (report_status_v2)
report_v2(commands, unpack_status); report_v2(commands, unpack_status);