diff options
author | Jeff King <peff@peff.net> | 2015-07-08 16:33:52 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-07-08 15:58:28 -0700 |
commit | 3096b2ecdb91c27cb9e64b692c480deed6c7e77e (patch) | |
tree | bb4a0d16e25322070d0ed5d2524c1ce88e156117 /pack-bitmap.h | |
parent | write_sha1_file: freshen existing objects (diff) | |
download | tgif-3096b2ecdb91c27cb9e64b692c480deed6c7e77e.tar.xz |
check_and_freshen_file: fix reversed success-check
When we want to write out a loose object file, we have
always first made sure we don't already have the object
somewhere. Since 33d4221 (write_sha1_file: freshen existing
objects, 2014-10-15), we also update the timestamp on the
file, so that a simultaneous prune knows somebody is
likely to reference it soon.
If our utime() call fails, we treat this the same as not
having the object in the first place; the safe thing to do
is write out another copy. However, the loose-object check
accidentally inverts the utime() check; it returns failure
_only_ when the utime() call actually succeeded. Thus it was
failing to protect us there, and in the normal case where
utime() succeeds, it caused us to pointlessly write out and
link the object.
This passed our freshening tests, because writing out the
new object is certainly _one_ way of updating its utime. So
the normal case was inefficient, but not wrong.
While we're here, let's also drop a comment in front of the
check_and_freshen functions, making a note of their return
type (since it is not our usual "0 for success, -1 for
error").
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pack-bitmap.h')
0 files changed, 0 insertions, 0 deletions