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

Re: [PATCH v2 2/2] merge-tree: add a new --dry-run flag

From
Elijah Newren <newren@gmail.com>
Date
May 13, 2025, 15:30 UTC
Message-ID
<CABPp-BHp7RXHFy18=fr1dqQgKiO3PNjXQkL2VX-cjSGsHp48aw@mail.gmail.com>
In-Reply-To
<xmqqa57giqyi.fsf@gitster.g>
On Tue, May 13, 2025 at 6:24 AM Junio C Hamano <gitster@pobox.com> wrote:
Show 27 quoted lines
>
> "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
> > From: Elijah Newren <newren@gmail.com>
> >
> > Git Forges may be interested in whether two branches can be merged while
> > not being interested in what the resulting merge tree is nor which files
> > conflicted.  For such cases, add a new --dry-run flag which
> > will make use of the new mergeability_only flag added to merge-ort in
> > the previous commit.  This option allows the merge machinery to, in the
>
> The first three lines are almost identical to [1/2] here, modulo the
> internal name still being mergeability-only while the external name
> is now dry-run, which is perfectly fine as long as that is done
> consistently.
>
> > diff --git a/Documentation/git-merge-tree.adoc b/Documentation/git-merge-tree.adoc
> > index cf0578f9b5e8..7dcc17806191 100644
> > --- a/Documentation/git-merge-tree.adoc
> > +++ b/Documentation/git-merge-tree.adoc
> > @@ -65,6 +65,12 @@ OPTIONS
> >       default is to include these messages if there are merge
> >       conflicts, and to omit them otherwise.
> >
> > +--mergeability-only::
>
> But is this internal or external name?

external; Kristoffer caught this oversight too. I'll send a re-roll with this fixed. (I apparently also missed it in the die-if-incompatible-options too, not sure how I missed all of these, but I'll ensure they're all fixed up).

Previous: Junio C HamanoNext: Junio C Hamano
Message 14 of 29 in “merge-tree: add new --mergeability-only option”
  1. 0/2 merge-tree: add new --mergeability-only optionElijah Newren via GitGitGadget, May 10, 2025
  2. 1/2 merge-ort: add a new mergeability_only optionElijah Newren via GitGitGadget, May 10, 2025
  3. 2/2 merge-tree: add a new --mergeability-only flagElijah Newren via GitGitGadget, May 10, 2025
  4. Junio C HamanoMay 12, 2025
  5. Elijah NewrenMay 12, 2025
  6. Junio C HamanoMay 12, 2025
  7. Elijah NewrenMay 12, 2025
  8. 0/2 merge-tree: add new --dry-run optionElijah Newren via GitGitGadget, May 12, 2025
  9. 1/2 merge-ort: add a new mergeability_only optionElijah Newren via GitGitGadget, May 12, 2025
  10. 2/2 merge-tree: add a new --dry-run flagElijah Newren via GitGitGadget, May 12, 2025
  11. Kristoffer HaugsbakkMay 13, 2025
  12. Elijah NewrenMay 13, 2025
  13. Junio C HamanoMay 13, 2025
  14. Elijah NewrenMay 13, 2025
  15. Junio C HamanoMay 14, 2025
  16. 0/2 merge-tree: add new --dry-run optionElijah Newren via GitGitGadget, May 14, 2025
  17. 1/2 merge-ort: add a new mergeability_only optionElijah Newren via GitGitGadget, May 14, 2025
  18. 2/2 merge-tree: add a new --dry-run flagElijah Newren via GitGitGadget, May 14, 2025
  19. Junio C HamanoMay 15, 2025
  20. Phillip WoodMay 16, 2025
  21. Elijah NewrenMay 16, 2025
  22. Kristoffer HaugsbakkMay 14, 2025
  23. 0/2 merge-tree: add new --quiet optionElijah Newren via GitGitGadget, May 16, 2025
  24. 1/2 merge-ort: add a new mergeability_only optionElijah Newren via GitGitGadget, May 16, 2025
  25. 2/2 merge-tree: add a new --quiet flagElijah Newren via GitGitGadget, May 16, 2025
  26. Kristoffer HaugsbakkMay 17, 2025
  27. Kristoffer HaugsbakkMay 17, 2025
  28. Phillip WoodMay 19, 2025
  29. Junio C HamanoMay 19, 2025

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.