Merge branch 'jn/maint-trim-vim-contrib' into maint

[git-core/git.git] / archive-tar.c

diff --git a/archive-tar.c b/archive-tar.c
index 0ba3f25..d1cce46 100644 (file)
--- 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 {