← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/git-core/intrepid-security

« back to all changes in this revision

Viewing changes to cache-tree.c

  • Committer: Package Import Robot
  • Author(s): Gerrit Pape
  • Date: 2007-10-04 08:27:01 UTC
  • mfrom: (1.1.23)
  • Revision ID: package-import@ubuntu.com-20071004082701-rsd058ontoqz4i30
Tags: 1:1.5.3.4-1
http://bugs.debian.org/445188
new upstream point release (closes: #445188).

Show diffs side-by-side

added added

removed removed

Lines of Context:
cache-tree.c
326
326
                        mode = ntohl(ce->ce_mode);
327
327
                        entlen = pathlen - baselen;
328
328
                }
329
 
                if (mode != S_IFDIRLNK && !missing_ok && !has_sha1_file(sha1))
 
329
                if (mode != S_IFGITLINK && !missing_ok && !has_sha1_file(sha1))
330
330
                        return error("invalid object %s", sha1_to_hex(sha1));
331
331
 
332
332
                if (!ce->ce_mode)
478
478
        if (0 <= it->entry_count) {
479
479
                if (size < 20)
480
480
                        goto free_return;
481
 
                hashcpy(it->sha1, (unsigned char*)buf);
 
481
                hashcpy(it->sha1, (const unsigned char*)buf);
482
482
                buf += 20;
483
483
                size -= 20;
484
484
        }