summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-08-22 12:34:10 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-08-22 12:34:10 -0700
commit207ad3cb203b7adeeb52b5372ace497e20739d49 (patch)
treee98f896ff4dcd71615cbf483f22ee1f42ffb715a /merge-recursive.c
parentMerge branch 'sg/do-not-skip-non-httpd-tests' (diff)
parentpack-refs: always refresh after taking the lock file (diff)
downloadtgif-207ad3cb203b7adeeb52b5372ace497e20739d49.tar.xz
Merge branch 'sc/pack-refs-deletion-racefix'
"git pack-refs" can lose refs that are created while running, which is getting corrected. * sc/pack-refs-deletion-racefix: pack-refs: always refresh after taking the lock file
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions