From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Oct 2017 04:48:19 +0000 (+0900)
Subject: Merge branch 'er/fast-import-dump-refs-on-checkpoint'
X-Git-Tag: v2.15.0-rc0~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/29a67ccc89b0f105aa8e6f675649145b88b2cb0e?hp=-c

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
---

29a67ccc89b0f105aa8e6f675649145b88b2cb0e
diff --combined fast-import.c
index 35bf671f12,365d3191aa..d5e4cf0bad
--- a/fast-import.c
+++ b/fast-import.c
@@@ -167,7 -167,6 +167,7 @@@ Format of STDIN stream
  #include "quote.h"
  #include "dir.h"
  #include "run-command.h"
 +#include "packfile.h"
  
  #define PACK_ID_BITS 16
  #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
@@@ -2952,7 -2951,7 +2952,7 @@@ static void parse_reset_branch(const ch
  
  static void cat_blob_write(const char *buf, unsigned long size)
  {
 -	if (write_in_full(cat_blob_fd, buf, size) != size)
 +	if (write_in_full(cat_blob_fd, buf, size) < 0)
  		die_errno("Write to frontend failed");
  }
  
@@@ -3189,10 -3188,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)