ls-files: --others should not say unmerged paths are unknown.

diff --git a/mktag.c b/mktag.c
index 8cbbef67e624d1d15bc4f2d7e2f9509be937c36d..585677eb83cd0fd21963d21291a6af2b54fc9c84 100644 (file)
--- a/mktag.c
+++ b/mktag.c
@@ -42,7 +42,7 @@ static int verify_tag(char *buffer, unsigned long size)
        int typelen;
        char type[20];
        unsigned char sha1[20];
-       const char *object, *type_line, *tag_line;
+       const char *object, *type_line, *tag_line, *tagger_line;
 
        if (size < 64 || size > MAXSIZE-1)
                return -1;
@@ -92,6 +92,12 @@ static int verify_tag(char *buffer, unsigned long size)
                return -1;
        }
 
+       /* Verify the tagger line */
+       tagger_line = tag_line;
+
+       if (memcmp(tagger_line, "tagger", 6) || (tagger_line[6] == '\n'))
+               return -1;
+
        /* The actual stuff afterwards we don't care about.. */
        return 0;
 }
@@ -119,7 +125,7 @@ int main(int argc, char **argv)
                size += ret;
        }
 
-       // Verify it for some basic sanity: it needs to start with "object <sha1>\ntype "
+       // Verify it for some basic sanity: it needs to start with "object <sha1>\ntype\ntagger "
        if (verify_tag(buffer, size) < 0)
                die("invalid tag signature file");