builtin/for-each-ref: stop using the_repository
Remove the_repository global variable in favor of the repository argument that gets passed in "builtin/for-each-ref.c". When `-h` is passed to the command outside a Git repository, the `run_builtin()` will call the `cmd_for_each_ref()` function with `repo` set to NULL and then early in the function, `parse_options()` call will give the options help and exit. Mentored-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Usman Akinyemi <usmanakinyemi202@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
d9c5cfb18f
commit
d9dce89192
@@ -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");
|
||||
|
||||
@@ -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 &&
|
||||
|
||||
Reference in New Issue
Block a user