diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-08 14:05:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-08 14:05:55 -0800 |
| commit | 171675a6c5c9e511b05d0db775e8bc9a1194cccf (patch) | |
| tree | 272623d507adad5df7deb5ae8fde55fb31496e33 /builtin | |
| parent | Merge branch 'dl/p4-encode-after-kw-expansion' into maint (diff) | |
| parent | read-cache: try not to peek into `struct {lock_,temp}file` (diff) | |
| download | git-171675a6c5c9e511b05d0db775e8bc9a1194cccf.tar.gz git-171675a6c5c9e511b05d0db775e8bc9a1194cccf.zip | |
Merge branch 'ma/more-opaque-lock-file' into maint
Code clean-up.
* ma/more-opaque-lock-file:
read-cache: try not to peek into `struct {lock_,temp}file`
refs/files-backend: don't peek into `struct lock_file`
midx: don't peek into `struct lock_file`
commit-graph: don't peek into `struct lock_file`
builtin/gc: don't peek into `struct lock_file`
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/gc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/gc.c b/builtin/gc.c index 4c24f41852..64f2b52d6e 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -92,7 +92,7 @@ static void process_log_file(void) */ int saved_errno = errno; fprintf(stderr, _("Failed to fstat %s: %s"), - get_tempfile_path(log_lock.tempfile), + get_lock_file_path(&log_lock), strerror(saved_errno)); fflush(stderr); commit_lock_file(&log_lock); @@ -1518,7 +1518,7 @@ static int update_background_schedule(int run_maintenance) strvec_split(&crontab_list.args, crontab_name); strvec_push(&crontab_list.args, "-l"); crontab_list.in = -1; - crontab_list.out = dup(lk.tempfile->fd); + crontab_list.out = dup(get_lock_file_fd(&lk)); crontab_list.git_cmd = 0; if (start_command(&crontab_list)) { @@ -1533,7 +1533,7 @@ static int update_background_schedule(int run_maintenance) * Read from the .lock file, filtering out the old * schedule while appending the new schedule. */ - cron_list = fdopen(lk.tempfile->fd, "r"); + cron_list = fdopen(get_lock_file_fd(&lk), "r"); rewind(cron_list); strvec_split(&crontab_edit.args, crontab_name); |