diff options
author | Junio C Hamano <junkio@cox.net> | 2005-06-27 03:33:33 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 15:27:51 -0700 |
commit | c4584ae3fd7cd595a638a07dfd853e9d2745e930 (patch) | |
tree | 735d3d7612055565941f98219ff862ce24ef2c78 /t | |
parent | ee85cbc6887d6ae4eb09a3e2c7319f66ae7c9034 (diff) | |
download | git-c4584ae3fd7cd595a638a07dfd853e9d2745e930.tar.gz git-c4584ae3fd7cd595a638a07dfd853e9d2745e930.tar.xz |
[PATCH] Remove "delta" object representation.
Packed delta files created by git-pack-objects seems to be the
way to go, and existing "delta" object handling code has exposed
the object representation details to too many places. Remove it
while we refactor code to come up with a proper interface in
sha1_file.c.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 't')
-rw-r--r-- | t/t5100-delta-pull.sh | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/t/t5100-delta-pull.sh b/t/t5100-delta-pull.sh deleted file mode 100644 index 8693c5ce8..000000000 --- a/t/t5100-delta-pull.sh +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2005 Junio C Hamano -# - -test_description='Test pulling deltified objects - -' -. ./test-lib.sh - -locate_obj='s|\(..\)|.git/objects/\1/|' - -test_expect_success \ - setup \ - 'cat ../README >a && - git-update-cache --add a && - a0=`git-ls-files --stage | - sed -e '\''s/^[0-7]* \([0-9a-f]*\) .*/\1/'\''` && - - sed -e 's/test/TEST/g' ../README >a && - git-update-cache a && - a1=`git-ls-files --stage | - sed -e '\''s/^[0-7]* \([0-9a-f]*\) .*/\1/'\''` && - tree=`git-write-tree` && - commit=`git-commit-tree $tree </dev/null` && - a0f=`echo "$a0" | sed -e "$locate_obj"` && - a1f=`echo "$a1" | sed -e "$locate_obj"` && - echo commit $commit && - echo a0 $a0 && - echo a1 $a1 && - ls -l $a0f $a1f && - echo $commit >.git/HEAD && - git-mkdelta -v $a0 $a1 && - ls -l $a0f $a1f' - -# Now commit has a tree that records delitified "a" whose SHA1 is a1. -# Create a new repo and pull this commit into it. - -test_expect_success \ - 'setup and cd into new repo' \ - 'mkdir dest && cd dest && rm -fr .git && git-init-db' - -test_expect_success \ - 'pull from deltified repo into a new repo without -d' \ - 'rm -fr .git a && git-init-db && - git-local-pull -v -a $commit ../.git/ && - git-cat-file blob $a1 >a && - diff -u a ../a' - -test_expect_failure \ - 'pull from deltified repo into a new repo with -d' \ - 'rm -fr .git a && git-init-db && - git-local-pull -v -a -d $commit ../.git/ && - git-cat-file blob $a1 >a && - diff -u a ../a' - -test_expect_failure \ - 'pull from deltified repo after delta failure without --recover' \ - 'rm -f a && - git-local-pull -v -a $commit ../.git/ && - git-cat-file blob $a1 >a && - diff -u a ../a' - -test_expect_success \ - 'pull from deltified repo after delta failure with --recover' \ - 'rm -f a && - git-local-pull -v -a --recover $commit ../.git/ && - git-cat-file blob $a1 >a && - diff -u a ../a' - -test_expect_success \ - 'missing-tree or missing-blob should be re-fetched without --recover' \ - 'rm -f a $a0f $a1f && - git-local-pull -v -a $commit ../.git/ && - git-cat-file blob $a1 >a && - diff -u a ../a' - -test_done - |