gitweb: Fix error in git_patchset_body for deletion in merge commit

diff --git a/archive-zip.c b/archive-zip.c
index 7c4984886f14aaba5d6a71c3b9213934b45d713a..1eaf262b7410e08f529ac48b9d56a131ba2a3ab3 100644 (file)
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -182,10 +182,10 @@ static int write_zip_entry(const unsigned char *sha1,
                goto out;
        }
 
-       if (S_ISDIR(mode)) {
+       if (S_ISDIR(mode) || S_ISDIRLNK(mode)) {
                method = 0;
                attr2 = 16;
-               result = READ_TREE_RECURSIVE;
+               result = (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
                out = NULL;
                uncompressed_size = 0;
                compressed_size = 0;