From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oa2-f26.google.com (mail-oa2-f26.google.com [74.125.231.90]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6373C43BDB0 for ; Thu, 17 Sep 2026 22:44:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.231.90 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789685048; cv=none; b=Z8qDasjEUnSxhT18HwIlWtyGnfhFAd2LzYKYsqGvk0G8BjFS8E/R+pfbgd0jnY9gjuLMqz5Sj81x2Gd8CRs4k0EFQSItKmF8LOsLnpntemo5iMPmLs+R8Ue0NRIdYJ1jnSCmeSCTvpgtJOz7iWYZA4GjgJQDB1Nrwib06nPLgyg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789685048; c=relaxed/simple; bh=ggejM4hdLe7o3GFFNoGdSZKwq3/tscVXL0gtwJBkn4Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RVorvRI38YSBzp4M7vJWKZWczCXhc6Y7rGaN6E9Bvy4z0ao6GXJbSMNqgYedIABlMtJ0dH0W9QkukimjsexScDNI6GLfKnUgw06iA7RrNBLueaiopdl7UYWxzxywXSZu6ZykLZKYd7A83GR9PMMMIh4YuSorptqLZQTN7HBbyKc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=tylercipriani.com; spf=none smtp.mailfrom=tylercipriani.com; dkim=pass (2048-bit key) header.d=tylercipriani-com.20251104.gappssmtp.com header.i=@tylercipriani-com.20251104.gappssmtp.com header.b=futhNWfG; arc=none smtp.client-ip=74.125.231.90 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=tylercipriani.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=tylercipriani.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=tylercipriani-com.20251104.gappssmtp.com header.i=@tylercipriani-com.20251104.gappssmtp.com header.b="futhNWfG" Received: by mail-oa2-f26.google.com with SMTP id 586e51a60fabf-466cc88a9b9so164596fac.2 for ; Thu, 17 Sep 2026 15:44:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tylercipriani-com.20251104.gappssmtp.com; s=20251104; t=1789685045; x=1790289845; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Ti6HEI0ikJ8DGjxW+3NDkXJzLB8niszaLu7fajaeDBY=; b=futhNWfGpaqmudDjimb1FqDW5ltewREAs+HvpuX4DDJUy8ww9DLsk/h6DqH4YB8zhO IvQKE92LW9NTj3sG8UioCQMQtg7208vrdtsNZsFQfsMAYuT7LrG2TGKEmtdXUgZBGl6e V+eRzdt7PiQ40Zwv0QpCPQOvTjLKTvaJbL/lxWNxrMWAmThChSgHI8lIoZb+lV+nvQDU UmK8QRDbzzYCi1jYmAa5KxSbyCBWlj575anF6vpLrPys4GgQkEzX3WMxSflt8eGy15gg OXAeD1liwKy2XNw/zIEtK9OzjVZn7nbTRXIESg2M3E0BOarpozHboXSFEsdPzKZAjuUh Pnaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789685045; x=1790289845; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=Ti6HEI0ikJ8DGjxW+3NDkXJzLB8niszaLu7fajaeDBY=; b=euxPXQgSdzgpuNMZcX064rI8iyQdPDtCINBa/ml1IFBwga1D8z4uXlWCOKIoXC1L1p hY0MfOdGoq2dl8h3X/QhKJiuHLT5YwjkDdl9kg5L3ejeNsrsockUX/hwgeaIA4C6v+vU WKs9KF1NdxjXS9yC2YCuvbBWD4vpjfCAmC/+k99nCJJ2seLcSKKuzkWj16+SnQMVU1BH jEuu49ozX4R2Rrg79gR0b3/EjnnbzOEx/6PFfCmHUounz8Ila0ChCB6ybLUYqHWkzI2T ZhQyIY6MCEI7v7v+puR1jBJXl+mHCMDLDFH+3C0pqGrGJA8pdsmv8jqWS9DYa++a4BMH b+sg== X-Gm-Message-State: AFuF++ldXQpEcqhZJCsbq4YAdJH3AuTMZ5K73ReRd1CeWhJwjG8XLIYm 2DhV9u4D9vzxDEBtLlRgDX+Ed5lZM5juqj/P2IF9akjm2vzA+fPgGMBXXP/KNMuKVUW7ynD217H SGwEVhYk= X-Gm-Gg: AYBFou3oyr0Tfl9SzcFEnIloS6teFWL07gYwo3Pge/kKZBO02o+bou0dYob4W6XlbA2 m7lFHEHsFxiJZzo58eo1t3Z4uH8sQr9ns5naUp9iCmuFIefE/tl2T3n8zLNhMUbBtkW6sLODMD4 n6rUquc5/o1bUPgLZGu1PJ6X8GsOOoFf53PUoJbgYj9cyrpwmSSPnK3RRyWQD+wlQ+TFjz3J1X1 mZs7IXJY2VL39dxnJ1KSy0L41LmDksngkg388LdCQRfnxwfgb+oIx2eoQp5/dfRQH/zueMYcIxp S6qtlytP/Josyu6qvw1f4TIa3rbf4GaPVhAVl8fw48VEn6f7uJAVPZwwz9zGwhBPNOPL0uhcf4F 1bYEZuMdbqIm4zn9MPywahcIvTr/f0UIxdZejPeguYFImVW/CvJeA1+OjyrSra5rk/7R4i5Duf1 yA0blwuN6Zi4Z0KYzO1s2Xbcvr1spSlgv/YCB+j+pTOuws3xGLcXyPaA5pPLr8fCW95sLRar4= X-Received: by 2002:a05:6820:1f10:b0:6b7:8415:d77a with SMTP id 006d021491bc7-6ca9c059d34mr581607eaf.37.1789685045054; Thu, 17 Sep 2026 15:44:05 -0700 (PDT) Received: from localhost ([161.97.221.21]) by smtp.gmail.com with UTF8SMTPSA id 006d021491bc7-6c8f5bfcebasm4124546eaf.3.2026.09.17.15.44.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 15:44:04 -0700 (PDT) From: Tyler Cipriani To: git@vger.kernel.org Cc: Tyler Cipriani , Srinidhi Kaushik , Stefan Haller , "D. Ben Knoble" , Phillip Wood , Johannes Schindelin , Junio C Hamano Subject: [PATCH v6 2/3] push: fix --force-if-includes non-branch advice Date: Thu, 17 Sep 2026 16:43:50 -0600 Message-ID: <20260917224351.57171-3-tyler@tylercipriani.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260917224351.57171-1-tyler@tylercipriani.com> References: <20260904210122.431757-1-tyler@tylercipriani.com> <20260917224351.57171-1-tyler@tylercipriani.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit When a --force-if-includes push is rejected due to lacking a reflog to consult, the advice is misleading: ! [rejected] HEAD -> main (remote ref updated since checkout) error: failed to push some refs to '' hint: Updates were rejected because the tip of the remote-tracking hint: branch has been updated since the last checkout. If you want hint: to integrate the remote changes, use 'git pull' before hint: pushing again. See the 'Note about fast-forwards' in 'git hint: push --help' for details. But a `git pull` will not fix this rejection. What is required is either - Specify the expected remote tip with --force-with-lease=: - Ignore the error with --no-force-if-includes Add ref->unverifiable to differentiate pushing something without a reflog to consult vs. a remote update rejection. Ensure tests check the rejection message. Reported-by: D. Ben Knoble Signed-off-by: Tyler Cipriani --- Documentation/config/advice.adoc | 4 ++++ advice.c | 1 + advice.h | 1 + builtin/push.c | 17 +++++++++++++++++ builtin/send-pack.c | 5 +++++ remote.c | 5 ++++- remote.h | 10 +++++++--- send-pack.c | 1 + t/t5533-push-cas.sh | 11 ++++++++--- transport-helper.c | 5 +++++ transport.c | 8 ++++++++ transport.h | 1 + 12 files changed, 62 insertions(+), 7 deletions(-) diff --git a/Documentation/config/advice.adoc b/Documentation/config/advice.adoc index 257db58918..8d258980ff 100644 --- a/Documentation/config/advice.adoc +++ b/Documentation/config/advice.adoc @@ -90,6 +90,10 @@ all advice messages. Shown when linkgit:git-push[1] rejects a forced update of a branch when its remote-tracking ref has updates that we do not have locally. + pushRefUnverifiable:: + Shown when linkgit:git-push[1] rejects a forced update of + a branch when we are unable to verify the remote-tracking + ref is integrated locally. pushUnqualifiedRefname:: Shown when linkgit:git-push[1] gives up trying to guess based on the source and destination refs what diff --git a/advice.c b/advice.c index 0018501b7b..08842deb66 100644 --- a/advice.c +++ b/advice.c @@ -69,6 +69,7 @@ static struct { [ADVICE_PUSH_NON_FF_CURRENT] = { "pushNonFFCurrent" }, [ADVICE_PUSH_NON_FF_MATCHING] = { "pushNonFFMatching" }, [ADVICE_PUSH_REF_NEEDS_UPDATE] = { "pushRefNeedsUpdate" }, + [ADVICE_PUSH_REF_UNVERIFIABLE] = { "pushRefUnverifiable" }, [ADVICE_PUSH_UNQUALIFIED_REF_NAME] = { "pushUnqualifiedRefName" }, [ADVICE_PUSH_UPDATE_REJECTED] = { "pushUpdateRejected" }, [ADVICE_PUSH_UPDATE_REJECTED_ALIAS] = { "pushNonFastForward" }, /* backwards compatibility */ diff --git a/advice.h b/advice.h index 8def280688..189eadc089 100644 --- a/advice.h +++ b/advice.h @@ -36,6 +36,7 @@ enum advice_type { ADVICE_PUSH_NON_FF_CURRENT, ADVICE_PUSH_NON_FF_MATCHING, ADVICE_PUSH_REF_NEEDS_UPDATE, + ADVICE_PUSH_REF_UNVERIFIABLE, ADVICE_PUSH_UNQUALIFIED_REF_NAME, ADVICE_PUSH_UPDATE_REJECTED, ADVICE_PUSH_UPDATE_REJECTED_ALIAS, diff --git a/builtin/push.c b/builtin/push.c index 6021b71d66..679d9cee83 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -319,6 +319,13 @@ static const char message_advice_ref_needs_update[] = "remote changes, use 'git pull' before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details."); +static const char message_advice_ref_unverifiable[] = + N_("Updates were rejected because what you are pushing is not a branch,\n" + "so there is no reflog to check against the tip of the remote-tracking\n" + "branch. If you want to push anyway, specify the expected value with\n" + "'--force-with-lease=:' or use '--no-force-if-includes'\n" + "to skip this check."); + static void advise_pull_before_push(void) { if (!advice_enabled(ADVICE_PUSH_NON_FF_CURRENT) || !advice_enabled(ADVICE_PUSH_UPDATE_REJECTED)) @@ -361,6 +368,14 @@ static void advise_ref_needs_update(void) advise(_(message_advice_ref_needs_update)); } +static void advise_ref_unverifiable(void) +{ + if (!advice_enabled(ADVICE_PUSH_REF_UNVERIFIABLE) || + !advice_enabled(ADVICE_PUSH_UPDATE_REJECTED)) + return; + advise(_(message_advice_ref_unverifiable)); +} + static int push_with_options(struct transport *transport, struct refspec *rs, int flags) { @@ -412,6 +427,8 @@ static int push_with_options(struct transport *transport, struct refspec *rs, advise_ref_needs_force(); } else if (reject_reasons & REJECT_REF_NEEDS_UPDATE) { advise_ref_needs_update(); + } else if (reject_reasons & REJECT_REF_UNVERIFIABLE) { + advise_ref_unverifiable(); } return 1; diff --git a/builtin/send-pack.c b/builtin/send-pack.c index 1412b49bc8..07accb6e6b 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -76,6 +76,11 @@ static void print_helper_status(struct ref *ref) msg = "remote ref updated since checkout"; break; + case REF_STATUS_REJECT_UNVERIFIABLE: + res = "error"; + msg = "remote ref unverifiable"; + break; + case REF_STATUS_REJECT_ALREADY_EXISTS: res = "error"; msg = "already exists"; diff --git a/remote.c b/remote.c index 887c7ec00c..b7b5ac0d28 100644 --- a/remote.c +++ b/remote.c @@ -1701,6 +1701,9 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror, else if (ref->check_reachable && ref->unreachable) reject_reason = REF_STATUS_REJECT_REMOTE_UPDATED; + else if (ref->check_reachable && ref->unverifiable) + reject_reason = + REF_STATUS_REJECT_UNVERIFIABLE; else /* * If the ref isn't stale, and is reachable @@ -2826,7 +2829,7 @@ static void check_if_includes_upstream(struct ref *remote) * then there is no reliable reflog to check */ if (!name || !starts_with(name, "refs/heads/")) { - remote->unreachable = 1; + remote->unverifiable = 1; return; } diff --git a/remote.h b/remote.h index 54b17e4b02..8e2d56c2c2 100644 --- a/remote.h +++ b/remote.h @@ -169,10 +169,13 @@ struct ref { /* Need to check if local reflog reaches the remote tip. */ check_reachable:1, /* - * Store the result of the check enabled by "check_reachable"; - * implies the local reflog does not reach the remote tip. + * Store the result of the check enabled by "check_reachable". + * "unreachable" implies the local reflog does not reach the remote + * tip. "unverifiable" implies no local branch reflog to check; i.e., + * detached HEAD. */ - unreachable:1; + unreachable:1, + unverifiable:1; enum { REF_NOT_MATCHED = 0, /* initial value */ @@ -203,6 +206,7 @@ struct ref { REF_STATUS_REJECT_STALE, REF_STATUS_REJECT_SHALLOW, REF_STATUS_REJECT_REMOTE_UPDATED, + REF_STATUS_REJECT_UNVERIFIABLE, REF_STATUS_UPTODATE, REF_STATUS_REMOTE_REJECT, REF_STATUS_EXPECTING_REPORT, diff --git a/send-pack.c b/send-pack.c index 3bb5afc687..6b78470f37 100644 --- a/send-pack.c +++ b/send-pack.c @@ -322,6 +322,7 @@ static int check_to_send_update(const struct ref *ref, const struct send_pack_ar case REF_STATUS_REJECT_NEEDS_FORCE: case REF_STATUS_REJECT_STALE: case REF_STATUS_REJECT_REMOTE_UPDATED: + case REF_STATUS_REJECT_UNVERIFIABLE: case REF_STATUS_REJECT_NODELETE: return CHECK_REF_STATUS_REJECTED; case REF_STATUS_UPTODATE: diff --git a/t/t5533-push-cas.sh b/t/t5533-push-cas.sh index 265be6a84c..38576917e4 100755 --- a/t/t5533-push-cas.sh +++ b/t/t5533-push-cas.sh @@ -311,7 +311,8 @@ test_expect_success 'background updates to remote can be mitigated with "--force git switch main && test_commit J && git fetch --all && - test_must_fail git push --force-with-lease --force-if-includes --all + test_must_fail git push --force-with-lease --force-if-includes --all 2>err && + test_grep "remote ref updated since checkout" err ) && git ls-remote dst refs/heads/main >actual.main && git ls-remote dst refs/heads/branch >actual.branch && @@ -458,7 +459,9 @@ test_expect_success '"--force-if-includes" should reject forced update from deta git reset --hard origin/main && git switch -c newbranch origin/main && git checkout HEAD^ && - test_must_fail git push --force-if-includes --force-with-lease origin HEAD:main + test_must_fail git push --force-if-includes --force-with-lease origin HEAD:main 2>err && + test_grep "remote ref unverifiable" err && + test_grep "no-force-if-includes" err ) ' @@ -473,7 +476,9 @@ test_expect_success '"--force-if-includes" should reject forced update from tag' git switch -c newbranch origin/main && git checkout HEAD^ && git tag stable && - test_must_fail git push --force-if-includes --force-with-lease origin stable:main + test_must_fail git push --force-if-includes --force-with-lease origin stable:main 2>err && + test_grep "remote ref unverifiable" err && + test_grep "no-force-if-includes" err ) ' diff --git a/transport-helper.c b/transport-helper.c index 80f90eb7ba..1763570352 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -893,6 +893,10 @@ static int push_update_ref_status(struct strbuf *buf, status = REF_STATUS_REJECT_REMOTE_UPDATED; FREE_AND_NULL(msg); } + else if (!strcmp(msg, "remote ref unverifiable")) { + status = REF_STATUS_REJECT_UNVERIFIABLE; + FREE_AND_NULL(msg); + } else if (!strcmp(msg, "forced update")) { forced = 1; FREE_AND_NULL(msg); @@ -1046,6 +1050,7 @@ static int push_refs_with_push(struct transport *transport, case REF_STATUS_REJECT_STALE: case REF_STATUS_REJECT_ALREADY_EXISTS: case REF_STATUS_REJECT_REMOTE_UPDATED: + case REF_STATUS_REJECT_UNVERIFIABLE: if (atomic) { reject_atomic_push(remote_refs, mirror); string_list_clear(&cas_options, 0); diff --git a/transport.c b/transport.c index 0f5ec30247..3d60d6de54 100644 --- a/transport.c +++ b/transport.c @@ -779,6 +779,11 @@ static int print_one_push_report(struct ref *ref, const char *dest, int count, "remote ref updated since checkout", report, porcelain, summary_width); break; + case REF_STATUS_REJECT_UNVERIFIABLE: + print_ref_status('!', "[rejected]", ref, ref->peer_ref, + "remote ref unverifiable", + report, porcelain, summary_width); + break; case REF_STATUS_REJECT_SHALLOW: print_ref_status('!', "[rejected]", ref, ref->peer_ref, "new shallow roots not allowed", @@ -893,6 +898,8 @@ void transport_print_push_status(const char *dest, struct ref *refs, *reject_reasons |= REJECT_NEEDS_FORCE; } else if (ref->status == REF_STATUS_REJECT_REMOTE_UPDATED) { *reject_reasons |= REJECT_REF_NEEDS_UPDATE; + } else if (ref->status == REF_STATUS_REJECT_UNVERIFIABLE) { + *reject_reasons |= REJECT_REF_UNVERIFIABLE; } } free(head); @@ -1348,6 +1355,7 @@ static int pre_push_hook_feed_stdin(int hook_stdin_fd, void *pp_cb UNUSED, void switch (r->status) { case REF_STATUS_REJECT_NONFASTFORWARD: case REF_STATUS_REJECT_REMOTE_UPDATED: + case REF_STATUS_REJECT_UNVERIFIABLE: case REF_STATUS_REJECT_STALE: case REF_STATUS_UPTODATE: return 0; /* skip refs which won't be pushed */ diff --git a/transport.h b/transport.h index 7e5867cffa..eaa3b616ee 100644 --- a/transport.h +++ b/transport.h @@ -256,6 +256,7 @@ void transport_set_verbosity(struct transport *transport, int verbosity, #define REJECT_FETCH_FIRST 0x08 #define REJECT_NEEDS_FORCE 0x10 #define REJECT_REF_NEEDS_UPDATE 0x20 +#define REJECT_REF_UNVERIFIABLE 0x40 int transport_push(struct repository *repo, struct transport *connection, -- 2.47.3