From: Chen BoJun <bojun.cbj@gmail.com>
To: git@vger.kernel.org
Cc: "Chen Bojun" <bojun.cbj@alibaba-inc.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Jiang Xin" <zhiyou.jx@alibaba-inc.com>,
"Teng Long" <dyroneteng@gmail.com>
Subject: [PATCH v2] receive-pack: purge temporary data if no command is ready to run
Date: Sat, 29 Jan 2022 14:35:38 +0800 [thread overview]
Message-ID: <20220129063538.24038-1-bojun.cbj@gmail.com> (raw)
In-Reply-To: <pull.1124.git.1642987616372.gitgitgadget@gmail.com>
From: Chen Bojun <bojun.cbj@alibaba-inc.com>
When pushing a hidden ref, e.g.:
$ git push origin HEAD:refs/hidden/foo
"receive-pack" will reject our request with an error message like this:
! [remote rejected] HEAD -> refs/hidden/foo (deny updating a hidden ref)
The remote side ("git-receive-pack") will not create the hidden ref as
expected, but the pack file sent by "git-send-pack" is left inside the
remote repository. I.e. the quarantine directory is not purged as it
should be.
Add a checkpoint before calling "tmp_objdir_migrate()" and after calling
the "pre-receive" hook to purge that temporary data in the quarantine
area when there is no command ready to run.
The reason we do not add the checkpoint before the "pre-receive" hook,
but after it, is that the "pre-receive" hook is called with a switch-off
"skip_broken" flag, and all commands, even broken ones, should be fed
by calling "feed_receive_hook()".
Add a new test case in t5516 as well.
Helped-by: Jiang Xin <zhiyou.jx@alibaba-inc.com>
Helped-by: Teng Long <dyroneteng@gmail.com>
Signed-off-by: Chen Bojun <bojun.cbj@alibaba-inc.com>
---
builtin/receive-pack.c | 9 +++++++++
t/t5516-fetch-push.sh | 8 ++++++++
2 files changed, 17 insertions(+)
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 9f4a0b816c..a0b193ab3f 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -1971,6 +1971,15 @@ static void execute_commands(struct command *commands,
return;
}
+ /*
+ * If there is no command ready to run, should return directly to destroy
+ * temporary data in the quarantine area.
+ */
+ for (cmd = commands; cmd && cmd->error_string; cmd = cmd->next)
+ ; /* nothing */
+ if (!cmd)
+ return;
+
/*
* Now we'll start writing out refs, which means the objects need
* to be in their final positions so that other processes can see them.
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 2f04cf9a1c..da70c45857 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -1809,4 +1809,12 @@ test_expect_success 'refuse fetch to current branch of bare repository worktree'
git -C bare.git fetch -u .. HEAD:wt
'
+test_expect_success 'refuse to push a hidden ref, and make sure do not pollute the repository' '
+ mk_empty testrepo &&
+ git -C testrepo config receive.hiderefs refs/hidden &&
+ git -C testrepo config receive.unpackLimit 1 &&
+ test_must_fail git push testrepo HEAD:refs/hidden/foo &&
+ test_dir_is_empty testrepo/.git/objects/pack
+'
+
test_done
--
2.32.0 (Apple Git-132)
next prev parent reply other threads:[~2022-01-29 6:35 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-24 1:26 [PATCH] receive-pack: purge temporary data if no command is ready to run BoJun via GitGitGadget
2022-01-24 15:17 ` Ævar Arnfjörð Bjarmason
2022-01-25 16:34 ` Lertz Chen
2022-01-24 23:32 ` Junio C Hamano
2022-01-25 16:49 ` Bojun Chen
2022-01-25 0:22 ` Jiang Xin
2022-01-29 6:35 ` Chen BoJun [this message]
2022-02-01 22:51 ` [PATCH v2] " Junio C Hamano
2022-02-01 23:27 ` Junio C Hamano
2022-02-05 7:17 ` Bojun Chen
2022-02-05 8:04 ` Junio C Hamano
2022-02-07 3:36 ` Jiang Xin
2022-02-07 8:02 ` Bojun Chen
2022-02-04 1:17 ` Junio C Hamano
2022-02-05 7:19 ` Bojun Chen
2022-02-05 8:02 ` Junio C Hamano
2022-02-07 7:57 ` [PATCH v3 0/1] " Chen BoJun
2022-02-07 7:57 ` [PATCH v3 1/1] receive-pack: " Chen BoJun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220129063538.24038-1-bojun.cbj@gmail.com \
--to=bojun.cbj@gmail.com \
--cc=avarab@gmail.com \
--cc=bojun.cbj@alibaba-inc.com \
--cc=dyroneteng@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=zhiyou.jx@alibaba-inc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).