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

Re: [PATCH v2 1/2] commit: Avoid redundant scissor line with --cleanup=scissors -v

From
Josh Triplett <josh@joshtriplett.org>
Date
Feb 29, 2024, 06:09 UTC
Message-ID
<ZeAftoPPRsltswbS@localhost>
In-Reply-To
<xmqqttlrj08t.fsf@gitster.g>
On Wed, Feb 28, 2024 at 09:41:22PM -0800, Junio C Hamano wrote:
Show 5 quoted lines
> Josh Triplett <josh@joshtriplett.org> writes:
> > If you do end up needing a resend of any of them, I'm happy to do so.
>
> I do not think there is need for resending, but I think you promised
> to add some tests earlier, so an updated patch may be in order ;-)
I did add a test; v2 that you replied to has this:
> Add a test for this.
[...]
>  t/t7502-commit-porcelain.sh |  5 +++++
[...]
Show 16 quoted lines
> diff --git a/t/t7502-commit-porcelain.sh b/t/t7502-commit-porcelain.sh
> index a87c211d0b..b37e2018a7 100755
> --- a/t/t7502-commit-porcelain.sh
> +++ b/t/t7502-commit-porcelain.sh
> @@ -736,6 +736,11 @@ test_expect_success 'message shows date when it is explicitly set' '
>         .git/COMMIT_EDITMSG
>  '
>  
> +test_expect_success 'message does not have multiple scissors lines' '
> +     git commit --cleanup=scissors -v --allow-empty -e -m foo &&
> +     test $(grep -c -e "--- >8 ---" .git/COMMIT_EDITMSG) -eq 1
> +'
> +
>  test_expect_success AUTOIDENT 'message shows committer when it is automatic' '
>  
>       echo >>negative &&
https://lore.kernel.org/git/xmqqedcxvnn8.fsf@gitster.g/T/#Z2e.:..:4f97933f173220544a5be2bf05c2bee2b044d2b1.1709024540.git.josh::40joshtriplett.org:1t:t7502-commit-porcelain.sh
Previous: Junio C HamanoNext: Junio C Hamano
Message 9 of 11 in “commit: Avoid redundant scissor line with --cleanup=scissors -v”
  1. commit: Avoid redundant scissor line with --cleanup=scissors -vJosh Triplett, Feb 26, 2024
  2. Junio C HamanoFeb 26, 2024
  3. Josh TriplettFeb 27, 2024
  4. 1/2 commit: Avoid redundant scissor line with --cleanup=scissors -vJosh Triplett, Feb 27, 2024
  5. 2/2 commit: Unify logic to avoid multiple scissors lines when mergingJosh Triplett, Feb 27, 2024
  6. Junio C HamanoFeb 27, 2024
  7. Josh TriplettFeb 29, 2024
  8. Junio C HamanoFeb 29, 2024
  9. Josh TriplettFeb 29, 2024
  10. Junio C HamanoFeb 29, 2024
  11. Junio C HamanoFeb 27, 2024

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.