By definition, narrow repository is incomplete. It does not even have
enough tree for a single commit. So populating a full index is
impossible.
Because of this, unpack_trees() is modified to only unpack trees
within $GIT_DIR/narrow, which narrow repo has all needed trees. This
makes the resulting index unsuitable for creating commits later on.
This is the reason index version is increased to 4, to avoid older
git from using it.
The resulting tree objects created from the index is only part of the
full tree. Manipulation will be needed at commit time to create proper
tree for commits.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx>
---
t/t1013-read-tree-narrow.sh | 72 +++++++++++++++++++++++++++++++++++++++++++
unpack-trees.c | 70 +++++++++++++++++++++++++++++++++++++++++-
2 files changed, 141 insertions(+), 1 deletions(-)
create mode 100755 t/t1013-read-tree-narrow.sh
diff --git a/t/t1013-read-tree-narrow.sh b/t/t1013-read-tree-narrow.sh
new file mode 100755
index 0000000..1921985
--- /dev/null
+++ b/t/t1013-read-tree-narrow.sh
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+test_description='read-tree in narrow mode'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+ test_tick &&
+ test_commit 1 &&
+ mkdir t1 t2 t1/t12 &&
+ echo 0 > f0 &&
+ echo 10 > t1/f10 &&
+ echo 120 > t1/t12/f120 &&
+ echo 20 > t2/f20
+ git add t1 t2 f0 && git commit -m initial &&
+ HEAD=`git rev-parse HEAD` &&
+ git rev-parse HEAD | git pack-objects --revs --narrow-tree=t1/t12 pack &&
+ test_create_repo narrow &&
+ mv pack-* narrow/.git/objects/pack &&
+ cd narrow &&
+ echo $HEAD >.git/refs/heads/master &&
+ echo "ref: refs/heads/master" >.git/HEAD &&
+ echo t1/t12 >.git/narrow
+'
+
+test_expect_failure ls-tree '
+ git ls-tree -r HEAD &&
+ git ls-files --stage >result &&
+ echo "100644 blob 52bd8e43afb01d0c9747f1fedf2fc94684ee4cc4 t1/t12/f120" >expected &&
+ test_cmp expected result
+'
+
+test_expect_success read-tree '
+ git read-tree HEAD &&
+ git ls-files --stage >result &&
+ echo "100644 52bd8e43afb01d0c9747f1fedf2fc94684ee4cc4 0 t1/t12/f120" >expected &&
+ test_cmp expected result
+'
+
+test_expect_success checkout '
+ git checkout . &&
+ test_cmp ../t1/t12/f120 t1/t12/f120
+'
+
+cat <<EOF >diff.expected
+diff --git a/t1/t12/f120 b/t1/t12/f120
+index 52bd8e4..645fb94 100644
+--- a/t1/t12/f120
++++ b/t1/t12/f120
+@@ -1 +1,2 @@
+ 120
++modified
+EOF
+
+test_expect_success diff '
+ echo modified >> t1/t12/f120 &&
+ git diff >result &&
+ test_cmp diff.expected result
+'
+
+test_expect_success 'diff HEAD' '
+ git diff HEAD >result &&
+ test_cmp diff.expected result
+'
+
+test_expect_success 'diff --cached' '
+ git add -u . &&
+ git diff --cached >result &&
+ test_cmp diff.expected result
+'
+
+test_done
diff --git a/unpack-trees.c b/unpack-trees.c
index f561d88..661fcb7 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -713,7 +713,7 @@ static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, str
* N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
* resulting index, -2 on failure to reflect the changes to the work tree.
*/
-int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options *o)
+static int unpack_trees_1(unsigned len, struct tree_desc *t, struct unpack_trees_options *o)
{
int i, ret;
static struct cache_entry *dfc;
@@ -839,6 +839,74 @@ return_failed:
goto done;
}
+static int find_tree_desc(struct tree_desc *desc, unsigned char *newsha1, const char *path)
+{
+ struct name_entry entry;
+ const char *slash;
+ int len;
+
+ slash = strchr(path, '/');
+ len = slash ? slash - path : strlen(path);
+
+ while (tree_entry(desc, &entry)) {
+ if (!S_ISDIR(entry.mode))
+ continue;
+ if (!strncmp(entry.path, path, len)) {
+ if (slash)
+ return find_tree(entry.sha1, newsha1, slash+1);
+ else {
+ hashcpy(newsha1, entry.sha1);
+ return 1;
+ }
+ }
+ }
+ return 0;
+}
+
+int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options *o)
+{
+ if (!get_narrow_prefix())
+ return unpack_trees_1(len, t, o);
+ else {
+ struct tree_desc *t2;
+ struct unpack_trees_options o2;
+ char *prefix = NULL;
+ void **buf;
+ int i, ret;
+ t2 = xmalloc(sizeof(*t2)*len);
+ buf = xmalloc(sizeof(*buf)*len);
+ for (i = 0; i < len; i++) {
+ unsigned char sha1[20];
+ unsigned long size;
+ enum object_type type;
+
+ if (!find_tree_desc(t+i, sha1, get_narrow_prefix()))
+ return -1;
+ buf[i] = read_sha1_file(sha1, &type, &size);
+ if (type != OBJ_TREE)
+ return -1;
+ init_tree_desc(t2+i, buf[i], size);
+ }
+ o2 = *o;
+ if (!o->prefix)
+ o2.prefix = xstrdup(get_narrow_prefix());
+ else {
+ prefix = xmalloc(strlen(get_narrow_prefix()) + strlen(o->prefix)+1);
+ strcpy(prefix, o->prefix);
+ strcat(prefix, get_narrow_prefix());
+ o2.prefix = prefix;
+ }
+ ret = unpack_trees_1(len, t2, &o2);
+ for (i = 0; i < len; i++) {
+ free(buf[i]);
+ }
+ free(prefix);
+ free(t2);
+ free(buf);
+ return ret;
+ }
+}
+
/* Here come the merge functions */
static int reject_merge(struct cache_entry *ce, struct unpack_trees_options *o)
--
1.7.1.rc1.69.g24c2f7
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html