diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-10-03 07:41:25 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-10-03 07:41:25 -0700 |
| commit | 3e3d4ee7cb7726dcf799f95d27bce384c32b2c8a (patch) | |
| tree | fe6a29d3d62f85eea9953deaf5653741fe73e54c /builtin-unpack-objects.c | |
| parent | d627f68fbbe0480337cd56cce442ed8c1efa230e (diff) | |
| parent | 0d1d154dbe4d16a802c2e357de96e349f04d2f2c (diff) | |
| download | git-3e3d4ee7cb7726dcf799f95d27bce384c32b2c8a.tar.xz | |
Merge branch 'pb/gitweb-tagcloud' into pb/gitweb
* pb/gitweb-tagcloud:
gitweb: Support for simple project search form
gitweb: Make the by_tag filter delve in forks as well
gitweb: Support for tag clouds
... (+ many updates from master) ...
Conflicts:
gitweb/gitweb.perl
Diffstat (limited to 'builtin-unpack-objects.c')
| -rw-r--r-- | builtin-unpack-objects.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/builtin-unpack-objects.c b/builtin-unpack-objects.c index 40b20f26e8..d2796b6309 100644 --- a/builtin-unpack-objects.c +++ b/builtin-unpack-objects.c @@ -19,7 +19,7 @@ static const char unpack_usage[] = "git unpack-objects [-n] [-q] [-r] [--strict] static unsigned char buffer[4096]; static unsigned int offset, len; static off_t consumed_bytes; -static SHA_CTX ctx; +static git_SHA_CTX ctx; /* * When running under --strict mode, objects whose reachability are @@ -59,7 +59,7 @@ static void *fill(int min) if (min > sizeof(buffer)) die("cannot fill %d bytes", min); if (offset) { - SHA1_Update(&ctx, buffer, offset); + git_SHA1_Update(&ctx, buffer, offset); memmove(buffer, buffer + offset, len); offset = 0; } @@ -539,10 +539,10 @@ int cmd_unpack_objects(int argc, const char **argv, const char *prefix) /* We don't take any non-flag arguments now.. Maybe some day */ usage(unpack_usage); } - SHA1_Init(&ctx); + git_SHA1_Init(&ctx); unpack_all(); - SHA1_Update(&ctx, buffer, offset); - SHA1_Final(sha1, &ctx); + git_SHA1_Update(&ctx, buffer, offset); + git_SHA1_Final(sha1, &ctx); if (strict) write_rest(); if (hashcmp(fill(20), sha1)) |