@matheusbsbs / matheus-bagliano / commits / 7c3c55026c

push: allow delete single-level ref

We discourage the creation/update of single-level refs because some upper-layer applications only work in specified reference namespaces, such as "refs/heads/*" or "refs/tags/*", these single-level refnames may not be recognized. However, we still hope users can delete them which have been created by mistake. Therefore, when updating branches on the server with "git receive-pack", by checking whether it is a branch deletion operation, it will determine whether to allow the update of a single-level refs. This avoids creating/updating such single-level refs, but allows them to be deleted. On the client side, "git push" also does not properly fill in the old-oid of single-level refs, which causes the server-side "git receive-pack" to think that the ref's old-oid has changed when deleting single-level refs, this causes the push to be rejected. So the solution is to fix the client to be able to delete single-level refs by properly filling old-oid. Signed-off-by: ZheNing Hu <adlternative@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

ZheNing Hu committed Mar 1, 2023 at 10:20 UTC 7c3c55026c25f038d790d21fb7242229a9a08fed

3 files changed +17 -2

builtin/receive-pack.c

+3 -1

@@ -1463,7 +1463,9 @@ static const char *update(struct command *cmd, struct shallow_info *si)

1463 find_shared_symref(worktrees, "HEAD", name);

1464

1465 /* only refs/... are allowed */

1466 - if (!starts_with(name, "refs/") || check_refname_format(name + 5, 0)) {

1466 + if (!starts_with(name, "refs/") ||

1467 + check_refname_format(name + 5, is_null_oid(new_oid) ?

1468 + REFNAME_ALLOW_ONELEVEL : 0)) {

1469 rp_error("refusing to update funny ref '%s' remotely", name);

1470 ret = "funny refname";

1471 goto out;

connect.c

+2 -1

@@ -30,7 +30,8 @@ static int check_ref(const char *name, unsigned int flags)

30 return 0;

32 /* REF_NORMAL means that we don't want the magic fake tag refs */

33 - if ((flags & REF_NORMAL) && check_refname_format(name, 0))

33 + if ((flags & REF_NORMAL) && check_refname_format(name,

34 + REFNAME_ALLOW_ONELEVEL))

35 return 0;

37 /* REF_HEADS means that we want regular branch heads */

t/t5516-fetch-push.sh

+12

@@ -401,6 +401,11 @@ test_expect_success 'push with ambiguity' '

401

402 '

403

404 +test_expect_success 'push with onelevel ref' '

405 + mk_test testrepo heads/main &&

406 + test_must_fail git push testrepo HEAD:refs/onelevel

407 +'

408 +

409 test_expect_success 'push with colon-less refspec (1)' '

410

411 mk_test testrepo heads/frotz tags/frotz &&

@@ -898,6 +903,13 @@ test_expect_success 'push --delete refuses empty string' '

903 test_must_fail git push testrepo --delete ""

904 '

905

906 +test_expect_success 'push --delete onelevel refspecs' '

907 + mk_test testrepo heads/main &&

908 + git -C testrepo update-ref refs/onelevel refs/heads/main &&

909 + git push testrepo --delete refs/onelevel &&

910 + test_must_fail git -C testrepo rev-parse --verify refs/onelevel

911 +'

912 +

913 test_expect_success 'warn on push to HEAD of non-bare repository' '

914 mk_test testrepo heads/main &&

915 (