git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v4] push: fix --force-if-includes when remote-tracking ref has no reflog

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 29, 2026, 16:54 UTC
Message-ID
<xmqq8q4khuax.fsf@gitster.g>
In-Reply-To
<20260929091319.86392-1-f@lex.la>
Aleksei Sviridkin <f@lex.la> writes:
Show 8 quoted lines
> Changes since v3:
>
> - log message rewritten. Two things in it were wrong, not just
>   unclear: it read as if a walk that stops at the cut-off skips the
>   merge-base check, and it said there is "no such moment" when what is
>   missing is the record of it.
> - test uses setup_src_dup_dst and expires only the remote-tracking
>   reflog.

Both changes look sensible. Thanks, Aleksei and Tyler, for writing and reviewing.

Will replace and mark it for 'next'.
Show 17 quoted lines
> +test_expect_success '"--force-if-includes" should allow forced update when remote-tracking ref has no reflog' '
> +	setup_src_dup_dst &&
> +	test_when_finished "rm -fr dst src dup" &&
> +	(
> +		cd src &&
> +		git switch branch &&
> +		git pull --rebase origin branch &&
> +		# the bug needs a remote-tracking ref with no reflog, and
> +		# the fetch above wrote one
> +		git reflog expire --expire=all refs/remotes/origin/branch &&
> +		git reset --hard HEAD^ &&
> +		test_commit I &&
> +		git push --force-if-includes --force-with-lease="branch"
> +	)
> +'
> +
>  test_done
Previous: Aleksei Sviridkin
Message 27 of 27 in “push: fix --force-if-includes when remote-tracking ref has no reflog”
  1. push: fix --force-if-includes when remote-tracking ref has no reflogAleksei Sviridkin, Sep 3, 2026
  2. Junio C HamanoSep 3, 2026
  3. Aleksei SviridkinSep 3, 2026
  4. Junio C HamanoSep 3, 2026
  5. Aleksei SviridkinSep 3, 2026
  6. Kristoffer HaugsbakkSep 4, 2026
  7. Junio C HamanoSep 4, 2026
  8. Aleksei SviridkinSep 5, 2026
  9. Kristoffer HaugsbakkSep 6, 2026
  10. Junio C HamanoSep 6, 2026
  11. Thomas BachemSep 7, 2026
  12. Weijie YuanSep 7, 2026
  13. push: fix --force-if-includes when remote-tracking ref has no reflogAleksei Sviridkin, Sep 4, 2026
  14. Junio C HamanoSep 4, 2026
  15. Junio C HamanoSep 6, 2026
  16. Aleksei SviridkinSep 6, 2026
  17. Junio C HamanoSep 8, 2026
  18. Aleksei SviridkinSep 9, 2026
  19. Junio C HamanoSep 10, 2026
  20. Aleksei SviridkinSep 10, 2026
  21. Tyler CiprianiSep 25, 2026
  22. Junio C HamanoSep 25, 2026
  23. push: fix --force-if-includes when remote-tracking ref has no reflogAleksei Sviridkin, Sep 5, 2026
  24. Tyler CiprianiSep 29, 2026
  25. Junio C HamanoSep 29, 2026
  26. push: fix --force-if-includes when remote-tracking ref has no reflogAleksei Sviridkin, Sep 29, 2026
  27. Junio C HamanoSep 29, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.