h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-07-01 08:11:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Rename populate_group_for_job to resolve_group_for_job

Browse Source 
Factor it to allows the function to not modify the job.
This commit is contained in:
ridiculousfish
2020-09-01 15:09:53 -07:00
parent 6c4d6dc4a9
commit 760b6e76cc
3 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/parse_execution.cpp
View File

@@ -1342,9 +1342,10 @@ end_execution_reason_t parse_execution_context_t::run_1_job(const ast::job_t &jo
// Clean up the job on failure or cancellation.
if (pop_result == end_execution_reason_t::ok) {
// Set the pgroup assignment mode and job group, now that the job is populated.
job_group_t::populate_group_for_job(job.get(), ctx.job_group);
assert(job->group && "Should have a job group");
// Resolve the job's group and mark if this job is the first to get it.
job->group = job_group_t::resolve_group_for_job(*job, ctx.job_group);
assert(job->group && "Should not have a null group");
job->mut_flags().is_group_root = (job->group != ctx.job_group);
// Success. Give the job to the parser - it will clean it up.
parser->job_add(job);