development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-06-30 22:54:27 +00:00
Code Issues Projects Releases Wiki Activity

promisor-remote: add promisor.quiet configuration option

Browse Source 
Add a configuration option to allow output from the promisor
fetching objects to be suppressed.

This allows us to stop commands like 'git blame' being swamped
with progress messages and gc notifications from the promisor
when used in a partial clone.

Signed-off-by: Tom Hughes <tom@compton.nu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Tom Hughes 2024-05-25 11:09:27 +01:00 committed by Junio C Hamano
parent 786a3e4b8d
commit 7e17d954d8
4 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/config.txt
View File

@ -487,6 +487,8 @@ include::config/pager.txt[]
include::config/pretty.txt[]
include::config/promisor.txt[]
include::config/protocol.txt[]
include::config/pull.txt[]

3
Documentation/config/promisor.txt Normal file
View File

@ -0,0 +1,3 @@
promisor.quiet::
If set to "true" assume `--quiet` when fetching additional
objects for a partial clone.

3
promisor-remote.c
View File

@ -22,6 +22,7 @@ static int fetch_objects(struct repository *repo,
struct child_process child = CHILD_PROCESS_INIT;
int i;
FILE *child_in;
int quiet;
child.git_cmd = 1;
child.in = -1;
@ -31,6 +32,8 @@ static int fetch_objects(struct repository *repo,
"fetch", remote_name, "--no-tags",
"--no-write-fetch-head", "--recurse-submodules=no",
"--filter=blob:none", "--stdin", NULL);
if (!git_config_get_bool("promisor.quiet", &quiet) && quiet)
strvec_push(&child.args, "--quiet");
if (start_command(&child))
die(_("promisor-remote: unable to fork off fetch subprocess"));
child_in = xfdopen(child.in, "w");

43
t/t0410-partial-clone.sh
View File

@ -3,6 +3,7 @@
test_description='partial clone'
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-terminal.sh
# missing promisor objects cause repacks which write bitmaps to fail
GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0
@ -689,6 +690,48 @@ test_expect_success 'lazy-fetch when accessing object not in the_repository' '
! grep "[?]$FILE_HASH" out
'
test_expect_success 'setup for promisor.quiet tests' '
rm -rf server &&
test_create_repo server &&
test_commit -C server foo &&
git -C server rm foo.t &&
git -C server commit -m remove &&
git -C server config uploadpack.allowanysha1inwant 1 &&
git -C server config uploadpack.allowfilter 1
'
test_expect_success TTY 'promisor.quiet=false shows progress messages' '
rm -rf repo &&
git clone --filter=blob:none "file://$(pwd)/server" repo &&
git -C repo config promisor.quiet "false" &&
test_terminal git -C repo cat-file -p foo:foo.t 2>err &&
# Ensure that progress messages are written
grep "Receiving objects" err
'
test_expect_success TTY 'promisor.quiet=true does not show progress messages' '
rm -rf repo &&
git clone --filter=blob:none "file://$(pwd)/server" repo &&
git -C repo config promisor.quiet "true" &&
test_terminal git -C repo cat-file -p foo:foo.t 2>err &&
# Ensure that no progress messages are written
! grep "Receiving objects" err
'
test_expect_success TTY 'promisor.quiet=unconfigured shows progress messages' '
rm -rf repo &&
git clone --filter=blob:none "file://$(pwd)/server" repo &&
test_terminal git -C repo cat-file -p foo:foo.t 2>err &&
# Ensure that progress messages are written
grep "Receiving objects" err
'
. "$TEST_DIRECTORY"/lib-httpd.sh
start_httpd