summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Linus Torvalds <torvalds@linux-foundation.org>2007-06-26 14:34:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-06-26 18:02:15 -0700
commit1164f1e48d7c8ed613e8a371ecfce27220606e09 (patch)
tree62c634bcc0572fdff04f5015d26deca21aa6dd56 /Documentation/merge-strategies.txt
parentIgnore submodule commits when fetching over dumb protocols (diff)
downloadtgif-1164f1e48d7c8ed613e8a371ecfce27220606e09.tar.xz
Fix zero-object version-2 packs
A pack-file can get created without any objects in it (to transfer "no data" - which can happen if you use a reference git repo, for example, or just otherwise just end up transferring only branch head information and already have all the objects themselves). And while we probably should never create an index for such a pack, if we do (and we do), the index file size sanity checking was incorrect. This fixes it. Reported-and-tested-by: Jocke Tjernlund <tjernlund@tjernlund.se> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions