mirror of
https://github.com/git/git.git
synced 2024-12-13 11:54:56 +08:00
9001dc2a74
This is the flip side of the previous two patches: checking for a non-zero oidcmp() can be more strictly expressed as inequality. Like those patches, we write "!= 0" in the coccinelle transformation, which covers by isomorphism the more common: if (oidcmp(E1, E2)) As with the previous two patches, this patch can be achieved almost entirely by running "make coccicheck"; the only differences are manual line-wrap fixes to match the original code. There is one thing to note for anybody replicating this, though: coccinelle 1.0.4 seems to miss the case in builtin/tag.c, even though it's basically the same as all the others. Running with 1.0.7 does catch this, so presumably it's just a coccinelle bug that was fixed in the interim. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
70 lines
1.6 KiB
C
70 lines
1.6 KiB
C
#include "test-tool.h"
|
|
#include "cache.h"
|
|
#include "tree.h"
|
|
#include "cache-tree.h"
|
|
|
|
|
|
static void dump_one(struct cache_tree *it, const char *pfx, const char *x)
|
|
{
|
|
if (it->entry_count < 0)
|
|
printf("%-40s %s%s (%d subtrees)\n",
|
|
"invalid", x, pfx, it->subtree_nr);
|
|
else
|
|
printf("%s %s%s (%d entries, %d subtrees)\n",
|
|
oid_to_hex(&it->oid), x, pfx,
|
|
it->entry_count, it->subtree_nr);
|
|
}
|
|
|
|
static int dump_cache_tree(struct cache_tree *it,
|
|
struct cache_tree *ref,
|
|
const char *pfx)
|
|
{
|
|
int i;
|
|
int errs = 0;
|
|
|
|
if (!it || !ref)
|
|
/* missing in either */
|
|
return 0;
|
|
|
|
if (it->entry_count < 0) {
|
|
/* invalid */
|
|
dump_one(it, pfx, "");
|
|
dump_one(ref, pfx, "#(ref) ");
|
|
}
|
|
else {
|
|
dump_one(it, pfx, "");
|
|
if (!oideq(&it->oid, &ref->oid) ||
|
|
ref->entry_count != it->entry_count ||
|
|
ref->subtree_nr != it->subtree_nr) {
|
|
/* claims to be valid but is lying */
|
|
dump_one(ref, pfx, "#(ref) ");
|
|
errs = 1;
|
|
}
|
|
}
|
|
|
|
for (i = 0; i < it->subtree_nr; i++) {
|
|
char path[PATH_MAX];
|
|
struct cache_tree_sub *down = it->down[i];
|
|
struct cache_tree_sub *rdwn;
|
|
|
|
rdwn = cache_tree_sub(ref, down->name);
|
|
xsnprintf(path, sizeof(path), "%s%.*s/", pfx, down->namelen, down->name);
|
|
if (dump_cache_tree(down->cache_tree, rdwn->cache_tree, path))
|
|
errs = 1;
|
|
}
|
|
return errs;
|
|
}
|
|
|
|
int cmd__dump_cache_tree(int ac, const char **av)
|
|
{
|
|
struct index_state istate;
|
|
struct cache_tree *another = cache_tree();
|
|
setup_git_directory();
|
|
if (read_cache() < 0)
|
|
die("unable to read index file");
|
|
istate = the_index;
|
|
istate.cache_tree = another;
|
|
cache_tree_update(&istate, WRITE_TREE_DRY_RUN);
|
|
return dump_cache_tree(active_cache_tree, another, "");
|
|
}
|