summaryrefslogtreecommitdiff
path: root/git-difftool.perl
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2014-08-23 01:27:07 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-08-25 12:19:50 -0700
commitafd11d3ebcfb18c29840dfa68be32c5215810a77 (patch)
tree1cc5fd232b72e6c8e10f0650788b290c37099710 /git-difftool.perl
parentGit 2.0.4 (diff)
downloadtgif-afd11d3ebcfb18c29840dfa68be32c5215810a77.tar.xz
pack-refs: prune top-level refs like "refs/foo"
After we have packed all refs, we prune any loose refs that correspond to what we packed. We do so by first taking a lock with lock_ref_sha1, and then deleting the loose ref file. However, lock_ref_sha1 will refuse to take a lock on any refs that exist at the top-level of the "refs/" directory, and we skip pruning the ref. This is almost certainly not what we want to happen here. The criteria to be pruned should not differ from that to be packed; if a ref makes it to prune_ref, it's because we want it both packed and pruned (if there are refs you do not want to be packed, they should be omitted much earlier by pack_ref_is_possible, which we do in this case if --all is not given). We can fix this by switching to lock_any_ref_for_update. This behaves exactly the same with the exception of this top-level check. Signed-off-by: Jeff King <peff@peff.net> Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu> Reviewed-by: Ronnie Sahlberg <sahlberg@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-difftool.perl')
0 files changed, 0 insertions, 0 deletions