projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure author & committer before asking for commit message.
[git.git]
/
pack-objects.c
diff --git
a/pack-objects.c
b/pack-objects.c
index
09f4f2c
..
aa2c098
100644
(file)
--- a/
pack-objects.c
+++ b/
pack-objects.c
@@
-10,6
+10,7
@@
#include "tree-walk.h"
#include <sys/time.h>
#include <signal.h>
#include "tree-walk.h"
#include <sys/time.h>
#include <signal.h>
+#include <stdint.h>
static const char pack_usage[] = "git-pack-objects [-q] [--no-reuse-delta] [--non-empty] [--local] [--incremental] [--window=N] [--depth=N] {--stdout | base-name} < object-list";
static const char pack_usage[] = "git-pack-objects [-q] [--no-reuse-delta] [--non-empty] [--local] [--incremental] [--window=N] [--depth=N] {--stdout | base-name} < object-list";
@@
-156,7
+157,7
@@
static void prepare_pack_revindex(struct pack_revindex *rix)
rix->revindex = xmalloc(sizeof(unsigned long) * (num_ent + 1));
for (i = 0; i < num_ent; i++) {
rix->revindex = xmalloc(sizeof(unsigned long) * (num_ent + 1));
for (i = 0; i < num_ent; i++) {
-
long hl = *((long
*)(index + 24 * i));
+
uint32_t hl = *((uint32_t
*)(index + 24 * i));
rix->revindex[i] = ntohl(hl);
}
/* This knows the pack format -- the 20-byte trailer
rix->revindex[i] = ntohl(hl);
}
/* This knows the pack format -- the 20-byte trailer
@@
-1052,7
+1053,7
@@
static int try_delta(struct unpacked *cur, struct unpacked *old, unsigned max_de
if (cur_entry->delta)
max_size = cur_entry->delta_size-1;
if (sizediff >= max_size)
if (cur_entry->delta)
max_size = cur_entry->delta_size-1;
if (sizediff >= max_size)
- return
-1
;
+ return
0
;
delta_buf = diff_delta(old->data, oldsize,
cur->data, size, &delta_size, max_size);
if (!delta_buf)
delta_buf = diff_delta(old->data, oldsize,
cur->data, size, &delta_size, max_size);
if (!delta_buf)
@@
-1231,7
+1232,7
@@
static void setup_progress_signal(void)
int main(int argc, char **argv)
{
SHA_CTX ctx;
int main(int argc, char **argv)
{
SHA_CTX ctx;
- char line[
PATH_MAX + 20
];
+ char line[
40 + 1 + PATH_MAX + 2
];
int window = 10, depth = 10, pack_to_stdout = 0;
struct object_entry **list;
int num_preferred_base = 0;
int window = 10, depth = 10, pack_to_stdout = 0;
struct object_entry **list;
int num_preferred_base = 0;