Merge branch 'rs/leave-base-name-in-name-field-of-tar' into maint

gitster · gitster · commit f0c103b49cc5 · 2013-01-14T07:34:12.000-08:00
A tar archive created by "git archive" recorded a directory in a
way that made NetBSD's implementation of "tar" sometimes unhappy.

* rs/leave-base-name-in-name-field-of-tar:
  archive-tar: split long paths more carefully
diff --git a/archive-tar.c b/archive-tar.c
@@ -153,6 +153,8 @@ static unsigned int ustar_header_chksum(const struct ustar_header *header)
 static size_t get_path_prefix(const char *path, size_t pathlen, size_t maxlen)
 {
 	size_t i = pathlen;
+	if (i > 1 && path[i - 1] == '/')
+		i--;
 	if (i > maxlen)
 		i = maxlen;
 	do {

Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,8 @@ static unsigned int ustar_header_chksum(const struct ustar_header *header)`
`153`	`153`	`static size_t get_path_prefix(const char *path, size_t pathlen, size_t maxlen)`
`154`	`154`	`{`
`155`	`155`	`size_t i = pathlen;`
	`156`	`+ if (i > 1 && path[i - 1] == '/')`
	`157`	`+ i--;`
`156`	`158`	`if (i > maxlen)`
`157`	`159`	`i = maxlen;`
`158`	`160`	`do {`