Merge branch 'lt/fix-sol-pack'

diff --git a/tar-tree.c b/tar-tree.c
index 8d9e31c20612f09f641a53b7876591b744eb0cea..bd289a98f80d4a6869f3d7345bd53f16a43682bd 100644 (file)
--- a/tar-tree.c
+++ b/tar-tree.c
@@ -3,7 +3,7 @@
  */
 #include <time.h>
 #include "cache.h"
-#include "diff.h"
+#include "tree-walk.h"
 #include "commit.h"
 #include "strbuf.h"
 #include "tar.h"
@@ -94,7 +94,6 @@ static void write_blocked(void *buf, unsigned long size)
        }
        if (size) {
                memcpy(block + offset, buf, size);
-               buf += size;
                offset += size;
        }
        tail = offset % RECORDSIZE;