git/cache-tree.c, branch v1.4.2

Merge branch 'jc/gitlink' into next

2006-05-07T23:17:43Z

* jc/gitlink: write-tree: --prefix= read-tree: --prefix=/ option.

cache-tree: a bit more debugging support.

2006-05-03T23:10:45Z

Signed-off-by: Junio C Hamano

write-tree: --prefix=

2006-05-02T05:29:16Z

The "bind" commit can express an aggregation of multiple projects into a single commit. In such an organization, there would be one project, root of whose tree object is at the same level of the root of the aggregated projects, and other projects have their toplevel in separate subdirectories. Let's call that root level project the "primary project", and call other ones just "subprojects". You would first read-tree the primary project, and then graft the subprojects under their appropriate location using read-tree --prefix=/ repeatedly. To write out a tree object from such an index for a subproject, write-tree --prefix=/ is used. Signed-off-by: Junio C Hamano

cache-tree: replace a sscanf() by two strtol() calls

2006-05-02T05:14:03Z

On one of my systems, sscanf() first calls strlen() on the buffer. But this buffer is not terminated by NUL. So git crashed. strtol() does not share that problem, as it stops reading after the first non-digit. [jc: original patch was wrong and did not read the cache-tree structure correctly; this has been fixed up and tested minimally with fsck-objects. ] Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

cache-tree.c: typefix

2006-04-28T05:48:27Z

Signed-off-by: Junio C Hamano

cache_tree_update: give an option to update cache-tree only.

2006-04-27T23:21:54Z

When the extra "dryrun" parameter is true, cache_tree_update() recomputes the invalid entry but does not actually creates new tree object. Signed-off-by: Junio C Hamano

read-tree: teach 1-way merege and plain read to prime cache-tree.

2006-04-27T08:33:07Z

This teaches read-tree to fully populate valid cache-tree when reading a tree from scratch, or reading a single tree into an existing index, reusing only the cached stat information (i.e. one-way merge). We have already taught update-index about cache-tree, so "git checkout" followed by updates to a few path followed by a "git commit" would become very efficient. Signed-off-by: Junio C Hamano

cache-tree: sort the subtree entries.

2006-04-26T00:40:02Z

Not that this makes practical performance difference; the kernel tree for example has 200 or so directories that have subdirectory, and the largest ones have 57 of them (fs and drivers). With a test to apply 600 patches with git-apply and git-write-tree, this did not make more than one per-cent of a difference, but it is a good cleanup. Signed-off-by: Junio C Hamano

index: make the index file format extensible.

2006-04-25T04:24:13Z

... and move the cache-tree data into it. Signed-off-by: Junio C Hamano

cache-tree: protect against "git prune".

2006-04-24T22:12:42Z

We reused the cache-tree data without verifying the tree object still exists. Recompute in cache_tree_update() an otherwise valid cache-tree entry when the tree object disappeared. This is not usually a problem, but theoretically without this fix things can break when the user does something like this: - read-index from a side branch - write-tree the result - remove the side branch with "git branch -D" - remove the unreachable objects with "git prune" - write-tree what is in the index. Signed-off-by: Junio C Hamano