mirror of
https://github.com/git/git.git
synced 2024-05-23 13:46:09 +02:00
d64db5b334
If a builtin uses RUN_SETUP to request that git.c enter the repository directory, we'll get passed in a "prefix" variable with the path to the original directory. It's important to pass this to parse_options(), since we may use it to fix up relative OPT_FILENAME() options. Some builtins don't bother; let's make sure we do so consistently. There may not be any particular bugs fixed here; OPT_FILENAME is actually pretty rare, and none of these commands use it directly. However, this does future-proof us against somebody adding an option that uses it and creating a subtle bug that only shows up when you're in a subdirectory of the repository. In some cases, like hash-object and upload-pack, we don't specify RUN_SETUP, so we know the prefix will always be empty. It's still worth passing the variable along to keep the idiom consistent across all builtins (and of course it protects us if they ever _did_ switch to using RUN_SETUP). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
60 lines
1.9 KiB
C
60 lines
1.9 KiB
C
#include "builtin.h"
|
|
#include "cache.h"
|
|
#include "config.h"
|
|
#include "strbuf.h"
|
|
#include "parse-options.h"
|
|
#include "string-list.h"
|
|
#include "column.h"
|
|
|
|
static const char * const builtin_column_usage[] = {
|
|
N_("git column [<options>]"),
|
|
NULL
|
|
};
|
|
static unsigned int colopts;
|
|
|
|
static int column_config(const char *var, const char *value, void *cb)
|
|
{
|
|
return git_column_config(var, value, cb, &colopts);
|
|
}
|
|
|
|
int cmd_column(int argc, const char **argv, const char *prefix)
|
|
{
|
|
struct string_list list = STRING_LIST_INIT_DUP;
|
|
struct strbuf sb = STRBUF_INIT;
|
|
struct column_options copts;
|
|
const char *command = NULL, *real_command = NULL;
|
|
struct option options[] = {
|
|
OPT_STRING(0, "command", &real_command, N_("name"), N_("lookup config vars")),
|
|
OPT_COLUMN(0, "mode", &colopts, N_("layout to use")),
|
|
OPT_INTEGER(0, "raw-mode", &colopts, N_("layout to use")),
|
|
OPT_INTEGER(0, "width", &copts.width, N_("Maximum width")),
|
|
OPT_STRING(0, "indent", &copts.indent, N_("string"), N_("Padding space on left border")),
|
|
OPT_INTEGER(0, "nl", &copts.nl, N_("Padding space on right border")),
|
|
OPT_INTEGER(0, "padding", &copts.padding, N_("Padding space between columns")),
|
|
OPT_END()
|
|
};
|
|
|
|
/* This one is special and must be the first one */
|
|
if (argc > 1 && starts_with(argv[1], "--command=")) {
|
|
command = argv[1] + 10;
|
|
git_config(column_config, (void *)command);
|
|
} else
|
|
git_config(column_config, NULL);
|
|
|
|
memset(&copts, 0, sizeof(copts));
|
|
copts.padding = 1;
|
|
argc = parse_options(argc, argv, prefix, options, builtin_column_usage, 0);
|
|
if (argc)
|
|
usage_with_options(builtin_column_usage, options);
|
|
if (real_command || command) {
|
|
if (!real_command || !command || strcmp(real_command, command))
|
|
die(_("--command must be the first argument"));
|
|
}
|
|
finalize_colopts(&colopts, -1);
|
|
while (!strbuf_getline(&sb, stdin))
|
|
string_list_append(&list, sb.buf);
|
|
|
|
print_columns(&list, colopts, &copts);
|
|
return 0;
|
|
}
|