Andrew's git / gitweb.git / diff
?
Merge branch 'np/pack'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2008 03:19:30 +0000 (20:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2008 03:19:30 +0000 (20:19 -0700)
* 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

1  2 
builtin-pack-objects.c patch | diff1 | diff2 | blob | history
t/t5300-pack-object.sh patch | diff1 | diff2 | blob | history
diff --cc builtin-pack-objects.c
Simple merge
diff --cc t/t5300-pack-object.sh
index 3a0ef8759c9d7a55b95c56ca38cd3c37ac2432fa,8a8b0f1abae5ceeba99eef36a330b6839794145c..b335c6b42de59b9632ff29693c2d7c75dae9794a
--- 1/t/t5300-pack-object.sh
--- 2/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@@ -272,7 -272,8 +272,8 @@@ test_expect_success 
  
  test_expect_success \
      'make sure index-pack detects the SHA1 collision' \
-     'test_must_fail git index-pack -o bad.idx test-3.pack'
 -    'test_must_fail git-index-pack -o bad.idx test-3.pack 2>msg &&
++    'test_must_fail git index-pack -o bad.idx test-3.pack 2>msg &&
+      grep "SHA1 COLLISION FOUND" msg'
  
  test_expect_success \
      'honor pack.packSizeLimit' \