kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ua/some-builtins-wo-the-repository' 

A handful of built-in command implementations have been rewritten
to use the repository instance supplied by git.c:run_builtin(), its
caller.

* ua/some-builtins-wo-the-repository:
  builtin/checkout-index: stop using `the_repository`
  builtin/for-each-ref: stop using `the_repository`
  builtin/ls-files: stop using `the_repository`
  builtin/pack-refs: stop using `the_repository`
  builtin/send-pack: stop using `the_repository`
  builtin/verify-commit: stop using `the_repository`
  builtin/verify-tag: stop using `the_repository`
  config: teach repo_config to allow `repo` to be NULL
main
Junio C Hamano 2025-03-26 16:26:10 +09:00
parent def5e32bc5 09cbf1597e
commit 1a764cdbdc
16 changed files with 116 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
builtin/checkout-index.c
View File

@ -5,7 +5,6 @@
*
*/

#define USE_THE_REPOSITORY_VARIABLE
#define DISABLE_SIGN_COMPARE_WARNINGS

#include "builtin.h"
@ -68,10 +67,10 @@ static void write_tempfile_record(const char *name, const char *prefix)
}
}

static int checkout_file(const char *name, const char *prefix)
static int checkout_file(struct index_state *index, const char *name, const char *prefix)
{
int namelen = strlen(name);
int pos = index_name_pos(the_repository->index, name, namelen);
int pos = index_name_pos(index, name, namelen);
int has_same_name = 0;
int is_file = 0;
int is_skipped = 1;
@ -81,8 +80,8 @@ static int checkout_file(const char *name, const char *prefix)
if (pos < 0)
pos = -pos - 1;

while (pos <the_repository->index->cache_nr) {
struct cache_entry *ce =the_repository->index->cache[pos];
while (pos < index->cache_nr) {
struct cache_entry *ce = index->cache[pos];
if (ce_namelen(ce) != namelen ||
memcmp(ce->name, name, namelen))
break;
@ -137,13 +136,13 @@ static int checkout_file(const char *name, const char *prefix)
return -1;
}

static int checkout_all(const char *prefix, int prefix_length)
static int checkout_all(struct index_state *index, const char *prefix, int prefix_length)
{
int i, errs = 0;
struct cache_entry *last_ce = NULL;

for (i = 0; i < the_repository->index->cache_nr ; i++) {
struct cache_entry *ce = the_repository->index->cache[i];
for (i = 0; i < index->cache_nr ; i++) {
struct cache_entry *ce = index->cache[i];

if (S_ISSPARSEDIR(ce->ce_mode)) {
if (!ce_skip_worktree(ce))
@ -156,8 +155,8 @@ static int checkout_all(const char *prefix, int prefix_length)
* first entry inside the expanded sparse directory).
*/
if (ignore_skip_worktree) {
ensure_full_index(the_repository->index);
ce = the_repository->index->cache[i];
ensure_full_index(index);
ce = index->cache[i];
}
}

@ -213,7 +212,7 @@ static int option_parse_stage(const struct option *opt,
int cmd_checkout_index(int argc,
const char **argv,
const char *prefix,
struct repository *repo UNUSED)
struct repository *repo)
{
int i;
struct lock_file lock_file = LOCK_INIT;
@ -253,19 +252,19 @@ int cmd_checkout_index(int argc,
show_usage_with_options_if_asked(argc, argv,
builtin_checkout_index_usage,
builtin_checkout_index_options);
git_config(git_default_config, NULL);
repo_config(repo, git_default_config, NULL);
prefix_length = prefix ? strlen(prefix) : 0;

prepare_repo_settings(the_repository);
the_repository->settings.command_requires_full_index = 0;
prepare_repo_settings(repo);
repo->settings.command_requires_full_index = 0;

if (repo_read_index(the_repository) < 0) {
if (repo_read_index(repo) < 0) {
die("invalid cache");
}

argc = parse_options(argc, argv, prefix, builtin_checkout_index_options,
builtin_checkout_index_usage, 0);
state.istate = the_repository->index;
state.istate = repo->index;
state.force = force;
state.quiet = quiet;
state.not_new = not_new;
@ -285,8 +284,8 @@ int cmd_checkout_index(int argc,
*/
if (index_opt && !state.base_dir_len && !to_tempfile) {
state.refresh_cache = 1;
state.istate = the_repository->index;
repo_hold_locked_index(the_repository, &lock_file,
state.istate = repo->index;
repo_hold_locked_index(repo, &lock_file,
LOCK_DIE_ON_ERROR);
}

@ -304,7 +303,7 @@ int cmd_checkout_index(int argc,
if (read_from_stdin)
die("git checkout-index: don't mix '--stdin' and explicit filenames");
p = prefix_path(prefix, prefix_length, arg);
err |= checkout_file(p, prefix);
err |= checkout_file(repo->index, p, prefix);
free(p);
}

@ -326,7 +325,7 @@ int cmd_checkout_index(int argc,
strbuf_swap(&buf, &unquoted);
}
p = prefix_path(prefix, prefix_length, buf.buf);
err |= checkout_file(p, prefix);
err |= checkout_file(repo->index, p, prefix);
free(p);
}
strbuf_release(&unquoted);
@ -334,7 +333,7 @@ int cmd_checkout_index(int argc,
}

if (all)
err |= checkout_all(prefix, prefix_length);
err |= checkout_all(repo->index, prefix, prefix_length);

if (pc_workers > 1)
err |= run_parallel_checkout(&state, pc_workers, pc_threshold,
@ -344,7 +343,7 @@ int cmd_checkout_index(int argc,
return 1;

if (is_lock_file_locked(&lock_file) &&
write_locked_index(the_repository->index, &lock_file, COMMIT_LOCK))
write_locked_index(repo->index, &lock_file, COMMIT_LOCK))
die("Unable to write new index file");
return 0;
}

5
builtin/for-each-ref.c
View File

@ -1,4 +1,3 @@
#define USE_THE_REPOSITORY_VARIABLE
#include "builtin.h"
#include "commit.h"
#include "config.h"
@ -20,7 +19,7 @@ static char const * const for_each_ref_usage[] = {
int cmd_for_each_ref(int argc,
const char **argv,
const char *prefix,
struct repository *repo UNUSED)
struct repository *repo)
{
struct ref_sorting *sorting;
struct string_list sorting_options = STRING_LIST_INIT_DUP;
@ -63,7 +62,7 @@ int cmd_for_each_ref(int argc,

format.format = "%(objectname) %(objecttype)\t%(refname)";

git_config(git_default_config, NULL);
repo_config(repo, git_default_config, NULL);

/* Set default (refname) sorting */
string_list_append(&sorting_options, "refname");

32
builtin/ls-files.c
View File

@ -6,7 +6,6 @@
* Copyright (C) Linus Torvalds, 2005
*/

#define USE_THE_REPOSITORY_VARIABLE
#define DISABLE_SIGN_COMPARE_WARNINGS

#include "builtin.h"
@ -245,12 +244,13 @@ static void show_submodule(struct repository *superproject,
repo_clear(&subrepo);
}

static void expand_objectsize(struct strbuf *line, const struct object_id *oid,
static void expand_objectsize(struct repository *repo, struct strbuf *line,
const struct object_id *oid,
const enum object_type type, unsigned int padded)
{
if (type == OBJ_BLOB) {
unsigned long size;
if (oid_object_info(the_repository, oid, &size) < 0)
if (oid_object_info(repo, oid, &size) < 0)
die(_("could not get object info about '%s'"),
oid_to_hex(oid));
if (padded)
@ -283,10 +283,10 @@ static void show_ce_fmt(struct repository *repo, const struct cache_entry *ce,
else if (skip_prefix(format, "(objecttype)", &format))
strbuf_addstr(&sb, type_name(object_type(ce->ce_mode)));
else if (skip_prefix(format, "(objectsize:padded)", &format))
expand_objectsize(&sb, &ce->oid,
expand_objectsize(repo, &sb, &ce->oid,
object_type(ce->ce_mode), 1);
else if (skip_prefix(format, "(objectsize)", &format))
expand_objectsize(&sb, &ce->oid,
expand_objectsize(repo, &sb, &ce->oid,
object_type(ce->ce_mode), 0);
else if (skip_prefix(format, "(stage)", &format))
strbuf_addf(&sb, "%d", ce_stage(ce));
@ -348,7 +348,7 @@ static void show_ce(struct repository *repo, struct dir_struct *dir,
}
}

static void show_ru_info(struct index_state *istate)
static void show_ru_info(struct repository *repo, struct index_state *istate)
{
struct string_list_item *item;

@ -370,7 +370,7 @@ static void show_ru_info(struct index_state *istate)
if (!ui->mode[i])
continue;
printf("%s%06o %s %d\t", tag_resolve_undo, ui->mode[i],
repo_find_unique_abbrev(the_repository, &ui->oid[i], abbrev),
repo_find_unique_abbrev(repo, &ui->oid[i], abbrev),
i + 1);
write_name(path);
}
@ -567,7 +567,7 @@ static int option_parse_exclude_standard(const struct option *opt,
int cmd_ls_files(int argc,
const char **argv,
const char *cmd_prefix,
struct repository *repo UNUSED)
struct repository *repo)
{
int require_work_tree = 0, show_tag = 0, i;
char *max_prefix;
@ -647,15 +647,15 @@ int cmd_ls_files(int argc,
show_usage_with_options_if_asked(argc, argv,
ls_files_usage, builtin_ls_files_options);

prepare_repo_settings(the_repository);
the_repository->settings.command_requires_full_index = 0;
prepare_repo_settings(repo);
repo->settings.command_requires_full_index = 0;

prefix = cmd_prefix;
if (prefix)
prefix_len = strlen(prefix);
git_config(git_default_config, NULL);
repo_config(repo, git_default_config, NULL);

if (repo_read_index(the_repository) < 0)
if (repo_read_index(repo) < 0)
die("index file corrupt");

argc = parse_options(argc, argv, prefix, builtin_ls_files_options,
@ -724,7 +724,7 @@ int cmd_ls_files(int argc,
max_prefix = common_prefix(&pathspec);
max_prefix_len = get_common_prefix_len(max_prefix);

prune_index(the_repository->index, max_prefix, max_prefix_len);
prune_index(repo->index, max_prefix, max_prefix_len);

/* Treat unmatching pathspec elements as errors */
if (pathspec.nr && error_unmatch)
@ -748,13 +748,13 @@ int cmd_ls_files(int argc,
*/
if (show_stage || show_unmerged)
die(_("options '%s' and '%s' cannot be used together"), "ls-files --with-tree", "-s/-u");
overlay_tree_on_index(the_repository->index, with_tree, max_prefix);
overlay_tree_on_index(repo->index, with_tree, max_prefix);
}

show_files(the_repository, &dir);
show_files(repo, &dir);

if (show_resolve_undo)
show_ru_info(the_repository->index);
show_ru_info(repo, repo->index);

if (ps_matched && report_path_error(ps_matched, &pathspec)) {
fprintf(stderr, "Did you forget to 'git add'?\n");

8
builtin/pack-refs.c
View File

@ -1,5 +1,3 @@
#define USE_THE_REPOSITORY_VARIABLE

#include "builtin.h"
#include "config.h"
#include "gettext.h"
@ -15,7 +13,7 @@ static char const * const pack_refs_usage[] = {
int cmd_pack_refs(int argc,
const char **argv,
const char *prefix,
struct repository *repo UNUSED)
struct repository *repo)
{
struct ref_exclusions excludes = REF_EXCLUSIONS_INIT;
struct string_list included_refs = STRING_LIST_INIT_NODUP;
@ -39,7 +37,7 @@ int cmd_pack_refs(int argc,
N_("references to exclude")),
OPT_END(),
};
git_config(git_default_config, NULL);
repo_config(repo, git_default_config, NULL);
if (parse_options(argc, argv, prefix, opts, pack_refs_usage, 0))
usage_with_options(pack_refs_usage, opts);

@ -52,7 +50,7 @@ int cmd_pack_refs(int argc,
if (!pack_refs_opts.includes->nr)
string_list_append(pack_refs_opts.includes, "refs/tags/*");

ret = refs_pack_refs(get_main_ref_store(the_repository), &pack_refs_opts);
ret = refs_pack_refs(get_main_ref_store(repo), &pack_refs_opts);

clear_ref_exclusions(&excludes);
string_list_clear(&included_refs, 0);

7
builtin/send-pack.c
View File

@ -1,4 +1,3 @@
#define USE_THE_REPOSITORY_VARIABLE
#include "builtin.h"
#include "config.h"
#include "hex.h"
@ -151,7 +150,7 @@ static int send_pack_config(const char *k, const char *v,
int cmd_send_pack(int argc,
const char **argv,
const char *prefix,
struct repository *repo UNUSED)
struct repository *repo)
{
struct refspec rs = REFSPEC_INIT_PUSH;
const char *remote_name = NULL;
@ -212,7 +211,7 @@ int cmd_send_pack(int argc,
OPT_END()
};

git_config(send_pack_config, NULL);
repo_config(repo, send_pack_config, NULL);
argc = parse_options(argc, argv, prefix, options, send_pack_usage, 0);
if (argc > 0) {
dest = argv[0];
@ -317,7 +316,7 @@ int cmd_send_pack(int argc,
set_ref_status_for_push(remote_refs, args.send_mirror,
args.force_update);

ret = send_pack(the_repository, &args, fd, conn, remote_refs, &extra_have);
ret = send_pack(repo, &args, fd, conn, remote_refs, &extra_have);

if (helper_status)
print_helper_status(remote_refs);

13
builtin/verify-commit.c
View File

@ -5,7 +5,6 @@
*
* Based on git-verify-tag
*/
#define USE_THE_REPOSITORY_VARIABLE
#include "builtin.h"
#include "config.h"
#include "gettext.h"
@ -33,15 +32,15 @@ static int run_gpg_verify(struct commit *commit, unsigned flags)
return ret;
}

static int verify_commit(const char *name, unsigned flags)
static int verify_commit(struct repository *repo, const char *name, unsigned flags)
{
struct object_id oid;
struct object *obj;

if (repo_get_oid(the_repository, name, &oid))
if (repo_get_oid(repo, name, &oid))
return error("commit '%s' not found.", name);

obj = parse_object(the_repository, &oid);
obj = parse_object(repo, &oid);
if (!obj)
return error("%s: unable to read file.", name);
if (obj->type != OBJ_COMMIT)
@ -54,7 +53,7 @@ static int verify_commit(const char *name, unsigned flags)
int cmd_verify_commit(int argc,
const char **argv,
const char *prefix,
struct repository *repo UNUSED)
struct repository *repo)
{
int i = 1, verbose = 0, had_error = 0;
unsigned flags = 0;
@ -64,7 +63,7 @@ int cmd_verify_commit(int argc,
OPT_END()
};

git_config(git_default_config, NULL);
repo_config(repo, git_default_config, NULL);

argc = parse_options(argc, argv, prefix, verify_commit_options,
verify_commit_usage, PARSE_OPT_KEEP_ARGV0);
@ -78,7 +77,7 @@ int cmd_verify_commit(int argc,
* was received in the process of writing the gpg input: */
signal(SIGPIPE, SIG_IGN);
while (i < argc)
if (verify_commit(argv[i++], flags))
if (verify_commit(repo, argv[i++], flags))
had_error = 1;
return had_error;
}

7
builtin/verify-tag.c
View File

@ -5,7 +5,6 @@
*
* Based on git-verify-tag.sh
*/
#define USE_THE_REPOSITORY_VARIABLE
#include "builtin.h"
#include "config.h"
#include "gettext.h"
@ -23,7 +22,7 @@ static const char * const verify_tag_usage[] = {
int cmd_verify_tag(int argc,
const char **argv,
const char *prefix,
struct repository *repo UNUSED)
struct repository *repo)
{
int i = 1, verbose = 0, had_error = 0;
unsigned flags = 0;
@ -35,7 +34,7 @@ int cmd_verify_tag(int argc,
OPT_END()
};

git_config(git_default_config, NULL);
repo_config(repo, git_default_config, NULL);

argc = parse_options(argc, argv, prefix, verify_tag_options,
verify_tag_usage, PARSE_OPT_KEEP_ARGV0);
@ -56,7 +55,7 @@ int cmd_verify_tag(int argc,
struct object_id oid;
const char *name = argv[i++];

if (repo_get_oid(the_repository, name, &oid)) {
if (repo_get_oid(repo, name, &oid)) {
had_error = !!error("tag '%s' not found.", name);
continue;
}

4
config.c
View File

@ -2521,6 +2521,10 @@ void repo_config_clear(struct repository *repo)

void repo_config(struct repository *repo, config_fn_t fn, void *data)
{
if (!repo) {
read_very_early_config(fn, data);
return;
}
git_config_check_init(repo);
configset_iter(repo->config, fn, data);
}

9
config.h
View File

@ -219,6 +219,15 @@ void read_very_early_config(config_fn_t cb, void *data);
* repo-specific one; by overwriting, the higher-priority repo-specific
* value is left at the end).
*
* In cases where the repository variable is NULL, repo_config() will
* skip the per-repository config but retain system and global configs
* by calling read_very_early_config() which also ignores one-time
* overrides like "git -c var=val". This is to support handling "git foo -h"
* (which lets git.c:run_builtin() to pass NULL and have the cmd_foo()
* call repo_config() before calling parse_options() to notice "-h", give
* help and exit) for a command that ordinarily require a repository
* so this limitation may be OK (but if needed you are welcome to fix it).
*
* Unlike git_config_from_file(), this function respects includes.
*/
void repo_config(struct repository *r, config_fn_t fn, void *);

7
t/t0610-reftable-basics.sh
View File

@ -14,6 +14,13 @@ export GIT_TEST_DEFAULT_REF_FORMAT

INVALID_OID=$(test_oid 001)

test_expect_success 'pack-refs does not crash with -h' '
test_expect_code 129 git pack-refs -h >usage &&
test_grep "[Uu]sage: git pack-refs " usage &&
test_expect_code 129 nongit git pack-refs -h >usage &&
test_grep "[Uu]sage: git pack-refs " usage
'

test_expect_success 'init: creates basic reftable structures' '
test_when_finished "rm -rf repo" &&
git init repo &&

7
t/t2006-checkout-index-basic.sh
View File

@ -21,6 +21,13 @@ test_expect_success 'checkout-index -h in broken repository' '
test_grep "[Uu]sage" broken/usage
'

test_expect_success 'checkout-index does not crash with -h' '
test_expect_code 129 git checkout-index -h >usage &&
test_grep "[Uu]sage: git checkout-index " usage &&
test_expect_code 129 nongit git checkout-index -h >usage &&
test_grep "[Uu]sage: git checkout-index " usage
'

test_expect_success 'checkout-index reports errors (cmdline)' '
test_must_fail git checkout-index -- does-not-exist 2>stderr &&
test_grep not.in.the.cache stderr

7
t/t3004-ls-files-basic.sh
View File

@ -34,6 +34,13 @@ test_expect_success 'ls-files -h in corrupt repository' '
test_grep "[Uu]sage: git ls-files " broken/usage
'

test_expect_success 'ls-files does not crash with -h' '
test_expect_code 129 git ls-files -h >usage &&
test_grep "[Uu]sage: git ls-files " usage &&
test_expect_code 129 nongit git ls-files -h >usage &&
test_grep "[Uu]sage: git ls-files " usage
'

test_expect_success SYMLINKS 'ls-files with absolute paths to symlinks' '
mkdir subs &&
ln -s nosuch link &&

7
t/t5400-send-pack.sh
View File

@ -55,6 +55,13 @@ test_expect_success setup '
echo Rebase &&
git log'

test_expect_success 'send-pack does not crash with -h' '
test_expect_code 129 git send-pack -h >usage &&
test_grep "[Uu]sage: git send-pack " usage &&
test_expect_code 129 nongit git send-pack -h >usage &&
test_grep "[Uu]sage: git send-pack " usage
'

test_expect_success 'pack the source repository' '
git repack -a -d &&
git prune

7
t/t6300-for-each-ref.sh
View File

@ -292,6 +292,13 @@ test_expect_success 'Check invalid atoms names are errors' '
test_must_fail git for-each-ref --format="%(INVALID)" refs/heads
'

test_expect_success 'for-each-ref does not crash with -h' '
test_expect_code 129 git for-each-ref -h >usage &&
test_grep "[Uu]sage: git for-each-ref " usage &&
test_expect_code 129 nongit git for-each-ref -h >usage &&
test_grep "[Uu]sage: git for-each-ref " usage
'

test_expect_success 'Check format specifiers are ignored in naming date atoms' '
git for-each-ref --format="%(authordate)" refs/heads &&
git for-each-ref --format="%(authordate:default) %(authordate)" refs/heads &&

7
t/t7030-verify-tag.sh
View File

@ -7,6 +7,13 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
. "$TEST_DIRECTORY/lib-gpg.sh"

test_expect_success GPG 'verify-tag does not crash with -h' '
test_expect_code 129 git verify-tag -h >usage &&
test_grep "[Uu]sage: git verify-tag " usage &&
test_expect_code 129 nongit git verify-tag -h >usage &&
test_grep "[Uu]sage: git verify-tag " usage
'

test_expect_success GPG 'create signed tags' '
echo 1 >file && git add file &&
test_tick && git commit -m initial &&

7
t/t7510-signed-commit.sh
View File

@ -8,6 +8,13 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
GNUPGHOME_NOT_USED=$GNUPGHOME
. "$TEST_DIRECTORY/lib-gpg.sh"

test_expect_success GPG 'verify-commit does not crash with -h' '
test_expect_code 129 git verify-commit -h >usage &&
test_grep "[Uu]sage: git verify-commit " usage &&
test_expect_code 129 nongit git verify-commit -h >usage &&
test_grep "[Uu]sage: git verify-commit " usage
'

test_expect_success GPG 'create signed commits' '
test_oid_cache <<-\EOF &&
header sha1:gpgsig