From: Dmitry Ivankov Date: Sun, 18 Sep 2011 19:01:47 GMT Subject: [PATCH 2/3] fast-import: fix corner case for checkpoint Message-ID: <1316372508-7173-3-git-send-email-divanorama@gmail.com> In-Reply-To: <1316372508-7173-1-git-send-email-divanorama@gmail.com> checkpoint command makes fast-import finish current pack and write out branches/tags and marks. In case no new objects are added in current pack fast-import falls back to no-op. While it is possible that refs or marks need to be updated (to point to old objects). Make fast-import always dump them on checkpoint. But as before do not cycle_packfile if there are no objects to write. Signed-off-by: Dmitry Ivankov --- fast-import.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/fast-import.c b/fast-import.c index 907cb05..014a807 100644 --- a/fast-import.c +++ b/fast-import.c @@ -3025,12 +3025,11 @@ static void parse_ls(struct branch *b) static void checkpoint(void) { checkpoint_requested = 0; - if (object_count) { + if (object_count) cycle_packfile(); - dump_branches(); - dump_tags(); - dump_marks(); - } + dump_branches(); + dump_tags(); + dump_marks(); } static void parse_checkpoint(void) -- 1.7.3.4