![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Thomas Rast <trast@student.ethz.ch> | |
| Tue, 6 Dec 2011 17:43:37 +0000 (18:43 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 6 Dec 2011 22:57:36 +0000 (14:57 -0800) | ||
| commit | 996277c520641d650dc15ad751cc4ad33318e298 | |
| tree | 53ba60089bcd1c336438f7ac7d5f2d124029fece | tree | snapshot |
| parent | 4eb0346fb8f8a59a1fb7a6bd01154655a7020087 | commit | diff |
Refactor cache_tree_update idiom from commit
We'll need to safely create or update the cache-tree data of the_index
from other places. While at it, give it an argument that lets us
silence the messages produced by unmerged entries (which prevent it
from working).
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
We'll need to safely create or update the cache-tree data of the_index
from other places. While at it, give it an argument that lets us
silence the messages produced by unmerged entries (which prevent it
from working).
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/commit.c | diff | blob | history | |
| cache-tree.c | diff | blob | history | |
| cache-tree.h | diff | blob | history | |
| merge-recursive.c | diff | blob | history | |
| test-dump-cache-tree.c | diff | blob | history |