mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
receive-pack: purge temporary data if no command is ready to run
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
4c53a8c20f
commit
5407764069
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue