author | Junio C Hamano <gitster@pobox.com> | |
Fri, 19 Sep 2008 03:19:30 +0000 (20:19 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 19 Sep 2008 03:19:30 +0000 (20:19 -0700) | ||
commit | c4398286fa5245cf54d73f6016444179d73f140b | |
tree | 7615ae9e816ae37148e70e335a1d95a54216e890 | tree | snapshot |
parent | 8435bdfdc3dca1b19721e013374d936164928e33 | commit | diff |
parent | 5f020f720298ddba537f857a240ffa7debb05f54 | commit | diff |
Merge branch 'np/pack'
* np/pack:
t5300: improve SHA1 collision test
pack-objects: don't include missing preferred base objects
sha1write: don't copy full sized buffers
Conflicts:
t/t5300-pack-object.sh
* np/pack:
t5300: improve SHA1 collision test
pack-objects: don't include missing preferred base objects
sha1write: don't copy full sized buffers
Conflicts:
t/t5300-pack-object.sh
builtin-pack-objects.c | diff1 | | diff2 | | blob | history |
t/t5300-pack-object.sh | diff1 | | diff2 | | blob | history |