mirror of
https://github.com/git-for-windows/git.git
synced 2026-06-20 01:08:24 -05:00
Stop using `the_repository` in `setup_work_tree()` and instead accept
the repository as a parameter. The injection of `the_repository` is thus
bumped one level higher, where callers now pass it in explicitly.
Note that the function tracks two bits of information via global
variables. This of course doesn't make much sense anymore now that we
can set up worktrees for arbitrary repositories:
- We track whether the worktree has already been initialized and, if
so, we skip the call to `chdir_notify()` and setenv(3p). It does not
make much sense to store this info in the repository, as we _would_
want to update the environment when switching between worktrees back
and forth.
So instead of storing this info in the repository, we drop this
state entirely and live with the fact that we may execute the logic
twice. It should ultimately be idempotent though and thus not be
much of a problem.
- We track whether the worktree configuration is bogus. If so, and if
later on some caller tries to setup the worktree, then we'll die
instead. This is indeed information that we can move into the
repository itself.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
208 lines
5.2 KiB
C
208 lines
5.2 KiB
C
#define USE_THE_REPOSITORY_VARIABLE
|
|
#include "builtin.h"
|
|
#include "config.h"
|
|
#include "attr.h"
|
|
#include "environment.h"
|
|
#include "gettext.h"
|
|
#include "object-name.h"
|
|
#include "quote.h"
|
|
#include "setup.h"
|
|
#include "parse-options.h"
|
|
#include "write-or-die.h"
|
|
|
|
static int all_attrs;
|
|
static int cached_attrs;
|
|
static int stdin_paths;
|
|
static char *source;
|
|
static const char * const check_attr_usage[] = {
|
|
N_("git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] <pathname>..."),
|
|
N_("git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]"),
|
|
NULL
|
|
};
|
|
|
|
static int nul_term_line;
|
|
|
|
static const struct option check_attr_options[] = {
|
|
OPT_BOOL('a', "all", &all_attrs, N_("report all attributes set on file")),
|
|
OPT_BOOL(0, "cached", &cached_attrs, N_("use .gitattributes only from the index")),
|
|
OPT_BOOL(0 , "stdin", &stdin_paths, N_("read file names from stdin")),
|
|
OPT_BOOL('z', NULL, &nul_term_line,
|
|
N_("terminate input and output records by a NUL character")),
|
|
OPT_STRING(0, "source", &source, N_("<tree-ish>"), N_("which tree-ish to check attributes at")),
|
|
OPT_END()
|
|
};
|
|
|
|
static void output_attr(struct attr_check *check, const char *file)
|
|
{
|
|
int j;
|
|
int cnt = check->nr;
|
|
|
|
for (j = 0; j < cnt; j++) {
|
|
const char *value = check->items[j].value;
|
|
|
|
if (ATTR_TRUE(value))
|
|
value = "set";
|
|
else if (ATTR_FALSE(value))
|
|
value = "unset";
|
|
else if (ATTR_UNSET(value))
|
|
value = "unspecified";
|
|
|
|
if (nul_term_line) {
|
|
printf("%s%c" /* path */
|
|
"%s%c" /* attrname */
|
|
"%s%c" /* attrvalue */,
|
|
file, 0,
|
|
git_attr_name(check->items[j].attr), 0, value, 0);
|
|
} else {
|
|
quote_c_style(file, NULL, stdout, 0);
|
|
printf(": %s: %s\n",
|
|
git_attr_name(check->items[j].attr), value);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void check_attr(const char *prefix, struct attr_check *check,
|
|
int collect_all,
|
|
const char *file)
|
|
|
|
{
|
|
char *full_path =
|
|
prefix_path(the_repository, prefix, prefix ? strlen(prefix) : 0, file);
|
|
|
|
if (collect_all) {
|
|
git_all_attrs(the_repository->index, full_path, check);
|
|
} else {
|
|
git_check_attr(the_repository->index, full_path, check);
|
|
}
|
|
output_attr(check, file);
|
|
|
|
free(full_path);
|
|
}
|
|
|
|
static void check_attr_stdin_paths(const char *prefix, struct attr_check *check,
|
|
int collect_all)
|
|
{
|
|
struct strbuf buf = STRBUF_INIT;
|
|
struct strbuf unquoted = STRBUF_INIT;
|
|
strbuf_getline_fn getline_fn;
|
|
|
|
getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;
|
|
while (getline_fn(&buf, stdin) != EOF) {
|
|
if (!nul_term_line && buf.buf[0] == '"') {
|
|
strbuf_reset(&unquoted);
|
|
if (unquote_c_style(&unquoted, buf.buf, NULL))
|
|
die("line is badly quoted");
|
|
strbuf_swap(&buf, &unquoted);
|
|
}
|
|
check_attr(prefix, check, collect_all, buf.buf);
|
|
maybe_flush_or_die(stdout, "attribute to stdout");
|
|
}
|
|
strbuf_release(&buf);
|
|
strbuf_release(&unquoted);
|
|
}
|
|
|
|
static NORETURN void error_with_usage(const char *msg)
|
|
{
|
|
error("%s", msg);
|
|
usage_with_options(check_attr_usage, check_attr_options);
|
|
}
|
|
|
|
int cmd_check_attr(int argc,
|
|
const char **argv,
|
|
const char *prefix,
|
|
struct repository *repo UNUSED)
|
|
{
|
|
struct attr_check *check;
|
|
struct object_id initialized_oid;
|
|
int cnt, i, doubledash, filei;
|
|
|
|
if (!is_bare_repository())
|
|
setup_work_tree(the_repository);
|
|
|
|
repo_config(the_repository, git_default_config, NULL);
|
|
|
|
argc = parse_options(argc, argv, prefix, check_attr_options,
|
|
check_attr_usage, PARSE_OPT_KEEP_DASHDASH);
|
|
|
|
prepare_repo_settings(the_repository);
|
|
the_repository->settings.command_requires_full_index = 0;
|
|
|
|
if (repo_read_index(the_repository) < 0) {
|
|
die("invalid cache");
|
|
}
|
|
|
|
if (cached_attrs)
|
|
git_attr_set_direction(GIT_ATTR_INDEX);
|
|
|
|
doubledash = -1;
|
|
for (i = 0; doubledash < 0 && i < argc; i++) {
|
|
if (!strcmp(argv[i], "--"))
|
|
doubledash = i;
|
|
}
|
|
|
|
/* Process --all and/or attribute arguments: */
|
|
if (all_attrs) {
|
|
if (doubledash >= 1)
|
|
error_with_usage("Attributes and --all both specified");
|
|
|
|
cnt = 0;
|
|
filei = doubledash + 1;
|
|
} else if (doubledash == 0) {
|
|
error_with_usage("No attribute specified");
|
|
} else if (doubledash < 0) {
|
|
if (!argc)
|
|
error_with_usage("No attribute specified");
|
|
|
|
if (stdin_paths) {
|
|
/* Treat all arguments as attribute names. */
|
|
cnt = argc;
|
|
filei = argc;
|
|
} else {
|
|
/* Treat exactly one argument as an attribute name. */
|
|
cnt = 1;
|
|
filei = 1;
|
|
}
|
|
} else {
|
|
cnt = doubledash;
|
|
filei = doubledash + 1;
|
|
}
|
|
|
|
/* Check file argument(s): */
|
|
if (stdin_paths) {
|
|
if (filei < argc)
|
|
error_with_usage("Can't specify files with --stdin");
|
|
} else {
|
|
if (filei >= argc)
|
|
error_with_usage("No file specified");
|
|
}
|
|
|
|
check = attr_check_alloc();
|
|
if (!all_attrs) {
|
|
for (i = 0; i < cnt; i++) {
|
|
const struct git_attr *a = git_attr(argv[i]);
|
|
|
|
if (!a)
|
|
return error("%s: not a valid attribute name",
|
|
argv[i]);
|
|
attr_check_append(check, a);
|
|
}
|
|
}
|
|
|
|
if (source) {
|
|
if (repo_get_oid_tree(the_repository, source, &initialized_oid))
|
|
die("%s: not a valid tree-ish source", source);
|
|
set_git_attr_source(source);
|
|
}
|
|
|
|
if (stdin_paths)
|
|
check_attr_stdin_paths(prefix, check, all_attrs);
|
|
else {
|
|
for (i = filei; i < argc; i++)
|
|
check_attr(prefix, check, all_attrs, argv[i]);
|
|
maybe_flush_or_die(stdout, "attribute to stdout");
|
|
}
|
|
|
|
attr_check_free(check);
|
|
return 0;
|
|
}
|