| commit | 76ea93ccb5df138eb57b2e8f2aee61dd1ca666ea | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 4 Feb 2010 02:27:08 +0000 (3 18:27 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 4 Feb 2010 17:09:50 +0000 (4 09:09 -0800) | ||
| tree | 07eb62b7dcd8769484f4c53841576a64063fea16 | treesnapshot (tar.gz zip) |
| parent | 07cf0f2407709e3764ea989696b513ec32613504 | commitdiff |
fast-import.c: Fix big-file-threshold parsing bug
Manual merge made at 844ad3d (Merge branch 'sp/maint-fast-import-large-blob'
into sp/fast-import-large-blob, 2010-02-01) did not correctly reflect the change
of unit in which this variable's value is counted from its previous version.
Now it counts in bytes, not in megabytes.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Manual merge made at 844ad3d (Merge branch 'sp/maint-fast-import-large-blob'
into sp/fast-import-large-blob, 2010-02-01) did not correctly reflect the change
of unit in which this variable's value is counted from its previous version.
Now it counts in bytes, not in megabytes.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
| fast-import.c | diffblobblamehistory |