Re: [PATCH 2/3] git diff: improve A...B merge-base handling

From: Philip Oakley <philipoakley@iee.email>
Date: Jun 12, 2020, 13:38 UTC
Message-ID: <6eadaa89-fde7-4224-dcb9-ceef315942f2@iee.email>
In-Reply-To: <f7c8f094e02406a7d0cb0c61f880e5b01fa413c4.1591661021.git.gitgitgadget@gmail.com>

On 09/06/2020 01:03, Chris Torek via GitGitGadget wrote: [snip]

Show 8 quoted lines

> +test_description='behavior of diff with symmetric-diff setups'
> +
> +. ./test-lib.sh
> +
> +# build these situations:
> +#  - normal merge with one merge base (b1...b2);
> +#  - criss-cross merge ie 2 merge bases (b1...master);
> +#  - disjoint subgraph (orphan branch, b3...master).

nit: Use of b1, b2, b3 here, but br1, br2, br3 below

Show 11 quoted lines

> +#
> +#     B---E   <-- master
> +#    / \ /
> +#   A   X
> +#    \ / \
> +#     C---D--G   <-- br1
> +#      \    /
> +#       ---F   <-- br2
> +#
> +#  H  <-- br3
> +#

Philip

$ 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.