d1cbe1e6d8
hash.h depends upon and includes repository.h, due to the definition and use of the_hash_algo (defined as the_repository->hash_algo). However, most headers trying to include hash.h are only interested in the layout of the structs like object_id. Move the parts of hash.h that do not depend upon repository.h into a new file hash-ll.h (the "low level" parts of hash.h), and adjust other files to use this new header where the convenience inline functions aren't needed. This allows hash.h and object.h to be fairly small, minimal headers. It also exposes a lot of hidden dependencies on both path.h (which was brought in by repository.h) and repository.h (which was previously implicitly brought in by object.h), so also adjust other files to be more explicit about what they depend upon. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
72 lines
1.9 KiB
C
72 lines
1.9 KiB
C
#define USE_THE_INDEX_VARIABLE
|
|
#include "test-tool.h"
|
|
#include "cache.h"
|
|
#include "dir.h"
|
|
#include "hex.h"
|
|
#include "repository.h"
|
|
#include "setup.h"
|
|
|
|
static int compare_untracked(const void *a_, const void *b_)
|
|
{
|
|
const char *const *a = a_;
|
|
const char *const *b = b_;
|
|
return strcmp(*a, *b);
|
|
}
|
|
|
|
static int compare_dir(const void *a_, const void *b_)
|
|
{
|
|
const struct untracked_cache_dir *const *a = a_;
|
|
const struct untracked_cache_dir *const *b = b_;
|
|
return strcmp((*a)->name, (*b)->name);
|
|
}
|
|
|
|
static void dump(struct untracked_cache_dir *ucd, struct strbuf *base)
|
|
{
|
|
int i, len;
|
|
QSORT(ucd->untracked, ucd->untracked_nr, compare_untracked);
|
|
QSORT(ucd->dirs, ucd->dirs_nr, compare_dir);
|
|
len = base->len;
|
|
strbuf_addf(base, "%s/", ucd->name);
|
|
printf("%s %s", base->buf,
|
|
oid_to_hex(&ucd->exclude_oid));
|
|
if (ucd->recurse)
|
|
fputs(" recurse", stdout);
|
|
if (ucd->check_only)
|
|
fputs(" check_only", stdout);
|
|
if (ucd->valid)
|
|
fputs(" valid", stdout);
|
|
printf("\n");
|
|
for (i = 0; i < ucd->untracked_nr; i++)
|
|
printf("%s\n", ucd->untracked[i]);
|
|
for (i = 0; i < ucd->dirs_nr; i++)
|
|
dump(ucd->dirs[i], base);
|
|
strbuf_setlen(base, len);
|
|
}
|
|
|
|
int cmd__dump_untracked_cache(int ac, const char **av)
|
|
{
|
|
struct untracked_cache *uc;
|
|
struct strbuf base = STRBUF_INIT;
|
|
|
|
/* Set core.untrackedCache=keep before setup_git_directory() */
|
|
xsetenv("GIT_CONFIG_COUNT", "1", 1);
|
|
xsetenv("GIT_CONFIG_KEY_0", "core.untrackedCache", 1);
|
|
xsetenv("GIT_CONFIG_VALUE_0", "keep", 1);
|
|
|
|
setup_git_directory();
|
|
if (repo_read_index(the_repository) < 0)
|
|
die("unable to read index file");
|
|
uc = the_index.untracked;
|
|
if (!uc) {
|
|
printf("no untracked cache\n");
|
|
return 0;
|
|
}
|
|
printf("info/exclude %s\n", oid_to_hex(&uc->ss_info_exclude.oid));
|
|
printf("core.excludesfile %s\n", oid_to_hex(&uc->ss_excludes_file.oid));
|
|
printf("exclude_per_dir %s\n", uc->exclude_per_dir);
|
|
printf("flags %08x\n", uc->dir_flags);
|
|
if (uc->root)
|
|
dump(uc->root, &base);
|
|
return 0;
|
|
}
|