admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

builtin/send-pack: stop using the_repository

Browse Source 
Remove the_repository global variable in favor of the repository
argument that gets passed in "builtin/send-pack.c".

When `-h` is passed to the command outside a Git repository, the
`run_builtin()` will call the `cmd_send_pack()` 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:
Usman Akinyemi
2025-03-08 05:05:03 +05:30
committed by Junio C Hamano
parent db58d5a351
commit 1c14b1aede
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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);

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