author | Thomas Rast <trast@student.ethz.ch> | |
Tue, 6 Dec 2011 17:43:38 +0000 (18:43 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 6 Dec 2011 22:58:53 +0000 (14:58 -0800) | ||
commit | 11c8a74a64a49f236d475514f723123a8928463d | |
tree | f50a32b95aef604f059cf60813f8ad5be881e32c | tree | snapshot |
parent | 996277c520641d650dc15ad751cc4ad33318e298 | commit | diff |
commit: write cache-tree data when writing index anyway
In prepare_index(), we refresh the index, and then write it to disk if
this changed the index data. After running hooks we re-read the index
and compute the root tree sha1 with the cache-tree machinery.
This gives us a mostly free opportunity to write up-to-date cache-tree
data: we can compute it in prepare_index() immediately before writing
the index to disk.
If we do this, we were going to write the index anyway, and the later
cache-tree update has no further work to do. If we don't do it, we
don't do any extra work, though we still don't have have cache-tree
data after the commit.
The only case that suffers badly is when the pre-commit hook changes
many trees in the index. I'm writing this off as highly unusual.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
In prepare_index(), we refresh the index, and then write it to disk if
this changed the index data. After running hooks we re-read the index
and compute the root tree sha1 with the cache-tree machinery.
This gives us a mostly free opportunity to write up-to-date cache-tree
data: we can compute it in prepare_index() immediately before writing
the index to disk.
If we do this, we were going to write the index anyway, and the later
cache-tree update has no further work to do. If we don't do it, we
don't do any extra work, though we still don't have have cache-tree
data after the commit.
The only case that suffers badly is when the pre-commit hook changes
many trees in the index. I'm writing this off as highly unusual.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/commit.c | diff | blob | history | |
t/t0090-cache-tree.sh | diff | blob | history |