diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-08-26 09:17:26 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-08-25 22:56:03 -0700 |
| commit | 6da8bdcbbfd5ac9c4a92de79d7b4343d5d6bd4c5 (patch) | |
| tree | 5fba6f110fd63d02190cd5bcb4cb448791a99a3c /builtin/mktree.c | |
| parent | parse-options: fix clang opterror() -Wunused-value warning (diff) | |
| download | tgif-6da8bdcbbfd5ac9c4a92de79d7b4343d5d6bd4c5.tar.xz | |
fetch-pack: do not remove .git/shallow file when --depth is not specified
fetch_pack() can remove .git/shallow file when a shallow repository
becomes a full one again. This behavior is triggered incorrectly when
tags are also fetched because fetch_pack() will be called twice. At
the first fetch_pack() call:
- shallow_lock is set up
- alternate_shallow_file points to shallow_lock.filename, which is
"shallow.lock"
- commit_lock_file is called, which sets shallow_lock.filename to "".
alternate_shallow_file also becomes "" because it points to the
same memory.
At the second call, setup_alternate_shallow() is not called and
alternate_shallow_file remains "". It's mistaken as unshallow case and
.git/shallow is removed. The end result is a broken repository.
Fix this by always initializing alternate_shallow_file when
fetch_pack() is called. As an extra measure, check if args->depth > 0
before commit/rollback shallow file.
Reported-by: Kacper Kornet <kornet@camk.edu.pl>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/mktree.c')
0 files changed, 0 insertions, 0 deletions