diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-12-27 14:58:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-27 14:58:19 -0800 |
| commit | 53b2a5ff30cde96c5d62f60600996a0a95847842 (patch) | |
| tree | e7b1e93f7654832e50bf052e69329a93a8d8bcd6 /t | |
| parent | Merge branch 'tg/diff-no-index-refactor' (diff) | |
| parent | pack-objects doc: treat output filename as opaque (diff) | |
| download | tgif-53b2a5ff30cde96c5d62f60600996a0a95847842.tar.xz | |
Merge branch 'jk/name-pack-after-byte-representation'
Two packfiles that contain the same set of objects have
traditionally been named identically, but that made repacking a
repository that is already fully packed without any cruft with a
different packing parameter cumbersome. Update the convention to
name the packfile after the bytestream representation of the data,
not after the set of objects in it.
* jk/name-pack-after-byte-representation:
pack-objects doc: treat output filename as opaque
pack-objects: name pack files after trailer hash
sha1write: make buffer const-correct
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5302-pack-index.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh index fe82025d4a..4bbb718751 100755 --- a/t/t5302-pack-index.sh +++ b/t/t5302-pack-index.sh @@ -174,11 +174,11 @@ test_expect_success \ test_expect_success \ '[index v1] 5) pack-objects happily reuses corrupted data' \ 'pack4=$(git pack-objects test-4 <obj-list) && - test -f "test-4-${pack1}.pack"' + test -f "test-4-${pack4}.pack"' test_expect_success \ '[index v1] 6) newly created pack is BAD !' \ - 'test_must_fail git verify-pack -v "test-4-${pack1}.pack"' + 'test_must_fail git verify-pack -v "test-4-${pack4}.pack"' test_expect_success \ '[index v2] 1) stream pack to repository' \ |