X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=tar-tree.c;h=705b8fa1c76dc665333f180278dca929e2a971f7;hb=b4a081b428c607f98c5d0a0eec8d543dc1f2abcd;hp=11bbc81e36d6e3ac16ff7f113b01d9d651f7edd3;hpb=86da1c567da0421649cb1e8e999311012c764337;p=git.git

diff --git a/tar-tree.c b/tar-tree.c
index 11bbc81e..705b8fa1 100644
--- 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"
@@ -161,6 +161,16 @@ static unsigned int ustar_header_chksum(const struct ustar_header *header)
 	return chksum;
 }
 
+static int get_path_prefix(const struct strbuf *path, int maxlen)
+{
+	int i = path->len;
+	if (i > maxlen)
+		i = maxlen;
+	while (i > 0 && path->buf[i] != '/')
+		i--;
+	return i;
+}
+
 static void write_entry(const unsigned char *sha1, struct strbuf *path,
                         unsigned int mode, void *buffer, unsigned long size)
 {
@@ -195,9 +205,17 @@ static void write_entry(const unsigned char *sha1, struct strbuf *path,
 			return;
 		}
 		if (path->len > sizeof(header.name)) {
-			sprintf(header.name, "%s.data", sha1_to_hex(sha1));
-			strbuf_append_ext_header(&ext_header, "path",
-				                 path->buf, path->len);
+			int plen = get_path_prefix(path, sizeof(header.prefix));
+			int rest = path->len - plen - 1;
+			if (plen > 0 && rest <= sizeof(header.name)) {
+				memcpy(header.prefix, path->buf, plen);
+				memcpy(header.name, path->buf + plen + 1, rest);
+			} else {
+				sprintf(header.name, "%s.data",
+				        sha1_to_hex(sha1));
+				strbuf_append_ext_header(&ext_header, "path",
+				                         path->buf, path->len);
+			}
 		} else
 			memcpy(header.name, path->buf, path->len);
 	}
@@ -296,6 +314,7 @@ int main(int argc, char **argv)
 	current_path.len = current_path.eof = 0;
 
 	setup_git_directory();
+	git_config(git_default_config);
 
 	switch (argc) {
 	case 3: