undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recur: Explain why sha_eq() and struct stage_data cannot go

Browse Source 
There were two TODOs to remove sha_eq() and to convert users of
struct stage_data to active_cache users, but this is not possible.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Johannes Schindelin 2006-07-27 19:14:17 +02:00 committed by Junio C Hamano
parent c1d20846f4
commit 3058e9339f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
merge-recursive.c
View File

@ -47,8 +47,8 @@ static struct commit *make_virtual_commit(struct tree *tree, const char *comment
}
/*
* TODO: we should not have to copy the SHA1s around, but rather reference
* them. That way, sha_eq() is just sha1 == sha2.
* Since we use get_tree_entry(), which does not put the read object into
* the object pool, we cannot rely on a == b.
*/
static int sha_eq(const unsigned char *a, const unsigned char *b)
{
@ -58,9 +58,8 @@ static int sha_eq(const unsigned char *a, const unsigned char *b)
}
/*
* TODO: check if we can just reuse the active_cache structure: it is already
* sorted (by name, stage).
* Only problem: do not write it when flushing the cache.
* Since we want to write the index eventually, we cannot reuse the index
* for these (temporary) data.
*/
struct stage_data
{