When --objects=self-sufficient is specified instead of usual
"--objects", rev-list shows all objects reachable from trees
associated with the commits in its output. This can be used to
ensure that a single pack can be used to recreate the tree
associated with every commit in it.
Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]>
---
*** This makes things easier for the dumb puller because
*** self-sufficient pack means less falling back on traditional
*** http-pull.
rev-list.c | 7 ++-
t/t6100-rev-list-object.sh | 97 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 102 insertions(+), 2 deletions(-)
create mode 100644 t/t6100-rev-list-object.sh
60563326cea81f89098a88ab716fb4f02e326b43
diff --git a/rev-list.c b/rev-list.c
--- a/rev-list.c
+++ b/rev-list.c
@@ -27,6 +27,7 @@ static int bisect_list = 0;
static int tag_objects = 0;
static int tree_objects = 0;
static int blob_objects = 0;
+static int objects_self_sufficient = 0;
static int verbose_header = 0;
static int show_parents = 0;
static int hdr_termination = 0;
@@ -198,7 +199,7 @@ static void mark_tree_uninteresting(stru
struct object *obj = &tree->object;
struct tree_entry_list *entry;
- if (!tree_objects)
+ if (!tree_objects || objects_self_sufficient)
return;
if (obj->flags & UNINTERESTING)
return;
@@ -448,7 +449,9 @@ int main(int argc, char **argv)
bisect_list = 1;
continue;
}
- if (!strcmp(arg, "--objects")) {
+ if (!strncmp(arg, "--objects", 9)) {
+ if (!strcmp(arg+9, "=self-sufficient"))
+ objects_self_sufficient = 1;
tag_objects = 1;
tree_objects = 1;
blob_objects = 1;
diff --git a/t/t6100-rev-list-object.sh b/t/t6100-rev-list-object.sh
new file mode 100644
--- /dev/null
+++ b/t/t6100-rev-list-object.sh
@@ -0,0 +1,97 @@
+#!/bin/sh
+#
+# Copyright (c) 2005 Junio C Hamano
+#
+
+test_description='git-rev-list --objects test.
+
+'
+. ./test-lib.sh
+
+GIT_AUTHOR_DATE='+0000 946684801'
+GIT_AUTHOR_NAME=none
[EMAIL PROTECTED]
+GIT_COMMITTER_DATE='+0000 946684801'
+GIT_COMMITTER_NAME=none
[EMAIL PROTECTED]
+export GIT_AUTHOR_DATE GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL \
+ GIT_COMMITTER_DATE GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL
+
+_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
+_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
+sedScript='s/^\('"$_x40"' [^ ]*\) .*/\1/p'
+
+test_expect_success setup '
+ for i in frotz nitfol
+ do
+ echo $i >$i &&
+ git-update-cache --add $i || exit
+ done &&
+ tree0=$(git-write-tree) &&
+ commit0=$(git-commit-tree $tree0) &&
+ echo $tree0 &&
+ echo $commit0 &&
+ git-ls-tree -r $tree0 &&
+ echo nitfol nitfol >nitfol &&
+ git-update-cache --add nitfol &&
+ tree1=$(git-write-tree) &&
+ commit1=$(git-commit-tree $tree1 -p $commit0) &&
+ echo $tree1 &&
+ echo $commit1 &&
+ git-ls-tree -r $tree1
+' </dev/null
+
+test_expect_success 'pack #0' '
+ name0=$(git-rev-list --objects $commit0 | \
+ git-pack-objects pk0) &&
+ ls pk0-* &&
+ git-verify-pack -v pk0-$name0.idx |
+ sed -ne "$sedScript" | sort >contents.0
+'
+
+test_expect_success 'pack #1 (commit 1 except commit 0)' '
+ name1=$(git-rev-list --objects $commit1 ^$commit0 | \
+ git-pack-objects pk1) &&
+ ls pk1-* &&
+ git-verify-pack -v pk1-$name1.idx |
+ sed -ne "$sedScript" | sort >contents.1
+'
+
+test_expect_success 'there should not be any overlaps' '
+ case $(comm -12 contents.0 contents.1 | wc -l) in
+ 0) ;;
+ *) false ;;
+ esac
+'
+
+test_expect_success 'pack #2 (commit 1 unpacked only)' '
+ ln pk0-* .git/objects/pack/. &&
+ name2=$(git-rev-list --objects --unpacked $commit1 | \
+ git-pack-objects pk2) &&
+ ls pk2-* &&
+ git-verify-pack -v pk1-$name2.idx |
+ sed -ne "$sedScript" | sort >contents.2
+'
+
+test_expect_success 'pack #1 and #2 should be the same' '
+ diff contents.1 contents.2
+'
+
+test_expect_success 'pack #3 (commit 1 except commit 0, self-sufficient)' '
+ name3=$(git-rev-list --objects=self-sufficient $commit1 ^$commit0 | \
+ git-pack-objects pk3) &&
+ ls pk3-* &&
+ git-verify-pack -v pk3-$name3.idx |
+ sed -ne "$sedScript" | sort >contents.3
+'
+
+ls_tree_to_invent='s/^[0-9]* \([^ ]*\) \('"$_x40"'\) .*/\2 \1/'
+test_expect_success 'make sure pack #3 is not missing anything from commit1' '
+ (
+ echo "$tree1 tree"
+ echo "$commit1 commit"
+ git-ls-tree "$tree1" | sed -e "$ls_tree_to_invent"
+ ) | sort >tree-contents.1 &&
+ comm -23 tree-contents.1 contents.3 >missing.3 &&
+ diff /dev/null missing.3
+'
------------
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
