diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-05 07:48:19 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-05 07:48:19 +0300 |
| commit | 29a67ccc89b0f105aa8e6f675649145b88b2cb0e (patch) | |
| tree | 7326e8f93eade856ea1a84f78d5120b7752cea93 /fast-import.c | |
| parent | 8fb8a945bc2dea2bb04249213ad8dacffbfc604f (diff) | |
| parent | 30e215a65c9f75e0f2a72c9f695389179bc30f72 (diff) | |
Merge branch 'er/fast-import-dump-refs-on-checkpoint'
The checkpoint command "git fast-import" did not flush updates to
refs and marks unless at least one object was created since the
last checkpoint, which has been corrected, as these things can
happen without any new object getting created.
* er/fast-import-dump-refs-on-checkpoint:
fast-import: checkpoint: dump branches/tags/marks even if object_count==0
Diffstat (limited to 'fast-import.c')
| -rw-r--r-- | fast-import.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fast-import.c b/fast-import.c index 35bf671f12..d5e4cf0bad 100644 --- a/fast-import.c +++ b/fast-import.c @@ -3189,10 +3189,10 @@ static void checkpoint(void) checkpoint_requested = 0; if (object_count) { cycle_packfile(); - dump_branches(); - dump_tags(); - dump_marks(); } + dump_branches(); + dump_tags(); + dump_marks(); } static void parse_checkpoint(void) |