projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fmt-patch: understand old <his> notation
[git.git]
/
pack-objects.c
diff --git
a/pack-objects.c
b/pack-objects.c
index
c0acc46
..
53caed4
100644
(file)
--- a/
pack-objects.c
+++ b/
pack-objects.c
@@
-1032,12
+1032,6
@@
static int try_delta(struct unpacked *cur, struct unpacked *old, unsigned max_de
max_depth -= cur_entry->delta_limit;
}
max_depth -= cur_entry->delta_limit;
}
- size = cur_entry->size;
- oldsize = old_entry->size;
- sizediff = oldsize > size ? oldsize - size : size - oldsize;
-
- if (size < 50)
- return -1;
if (old_entry->depth >= max_depth)
return 0;
if (old_entry->depth >= max_depth)
return 0;
@@
-1048,9
+1042,12
@@
static int try_delta(struct unpacked *cur, struct unpacked *old, unsigned max_de
* more space-efficient (deletes don't have to say _what_ they
* delete).
*/
* more space-efficient (deletes don't have to say _what_ they
* delete).
*/
+ size = cur_entry->size;
max_size = size / 2 - 20;
if (cur_entry->delta)
max_size = cur_entry->delta_size-1;
max_size = size / 2 - 20;
if (cur_entry->delta)
max_size = cur_entry->delta_size-1;
+ oldsize = old_entry->size;
+ sizediff = oldsize < size ? size - oldsize : 0;
if (sizediff >= max_size)
return 0;
delta_buf = diff_delta(old->data, oldsize,
if (sizediff >= max_size)
return 0;
delta_buf = diff_delta(old->data, oldsize,
@@
-1109,6
+1106,9
@@
static void find_deltas(struct object_entry **list, int window, int depth)
*/
continue;
*/
continue;
+ if (entry->size < 50)
+ continue;
+
free(n->data);
n->entry = entry;
n->data = read_sha1_file(entry->sha1, type, &size);
free(n->data);
n->entry = entry;
n->data = read_sha1_file(entry->sha1, type, &size);
@@
-1239,6
+1239,7
@@
int main(int argc, char **argv)
setup_git_directory();
setup_git_directory();
+ progress = isatty(2);
for (i = 1; i < argc; i++) {
const char *arg = argv[i];
for (i = 1; i < argc; i++) {
const char *arg = argv[i];
@@
-1269,6
+1270,10
@@
int main(int argc, char **argv)
usage(pack_usage);
continue;
}
usage(pack_usage);
continue;
}
+ if (!strcmp("--progress", arg)) {
+ progress = 1;
+ continue;
+ }
if (!strcmp("-q", arg)) {
progress = 0;
continue;
if (!strcmp("-q", arg)) {
progress = 0;
continue;