diff options
author | Vincent Ambo <mail@tazj.in> | 2021-09-21T10·03+0300 |
---|---|---|
committer | Vincent Ambo <mail@tazj.in> | 2021-09-21T11·29+0300 |
commit | 43b1791ec601732ac31195df96781a848360a9ac (patch) | |
tree | daae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/t/helper/test-dump-cache-tree.c | |
parent | 2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff) |
chore(3p/git): Unvendor git and track patches instead r/2903
This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b
Diffstat (limited to 'third_party/git/t/helper/test-dump-cache-tree.c')
-rw-r--r-- | third_party/git/t/helper/test-dump-cache-tree.c | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/third_party/git/t/helper/test-dump-cache-tree.c b/third_party/git/t/helper/test-dump-cache-tree.c deleted file mode 100644 index 6a3f88f5f5d4..000000000000 --- a/third_party/git/t/helper/test-dump-cache-tree.c +++ /dev/null @@ -1,69 +0,0 @@ -#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, ""); -} |