merge-recursive: When we detect we can skip an update, actually skip it

diff --git a/pack-check.c b/pack-check.c
index 9d0cb9a114cb3e5b0a4a4a132b9289ef18d8ae21..a1a521648deee8e7e82c4e2cb7fe8fe03605dc06 100644 (file)
--- a/pack-check.c
+++ b/pack-check.c
@@ -2,8 +2,7 @@
 #include "pack.h"
 #include "pack-revindex.h"
 
-struct idx_entry
-{
+struct idx_entry {
        off_t                offset;
        const unsigned char *sha1;
        unsigned int nr;
@@ -24,7 +23,7 @@ int check_pack_crc(struct packed_git *p, struct pack_window **w_curs,
                   off_t offset, off_t len, unsigned int nr)
 {
        const uint32_t *index_crc;
-       uint32_t data_crc = crc32(0, Z_NULL, 0);
+       uint32_t data_crc = crc32(0, NULL, 0);
 
        do {
                unsigned int avail;