summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2018-05-04 19:40:08 -0400
committerLibravatar Jeff King <peff@peff.net>2018-05-21 23:55:12 -0400
commit6e328d6caef218db320978e3e251009135d87d0e (patch)
treee1d1fe6c3697352fb13c279cc7decf32581548cf /Documentation/merge-strategies.txt
parentfsck: call fsck_finish() after fscking objects (diff)
downloadtgif-6e328d6caef218db320978e3e251009135d87d0e.tar.xz
unpack-objects: call fsck_finish() after fscking objects
As with the previous commit, we must call fsck's "finish" function in order to catch any queued objects for .gitmodules checks. This second pass will be able to access any incoming objects, because we will have exploded them to loose objects by now. This isn't quite ideal, because it means that bad objects may have been written to the object database (and a subsequent operation could then reference them, even if the other side doesn't send the objects again). However, this is sufficient when used with receive.fsckObjects, since those loose objects will all be placed in a temporary quarantine area that will get wiped if we find any problems. Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions