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

Re: git merge --no-ff failure

From
NSNikolay Shustov <nikolay.shustov@gmail.com>
Date
Sep 25, 2025, 14:30 UTC
Message-ID
<0905d418-7693-485e-8646-a7e4413e6c0b@gmail.com>
In-Reply-To
<5cbb5c0a-4c51-4d15-816d-6d7d4fdf4fe1@gmail.com>

Just wanted to add to the initial bug report: the same scenario works on Linux fine (when git p4 repo is hosted on Linux).

On 9/25/25 09:31, Nikolay Shustov wrote:
Show 12 quoted lines
> Hi,
> Git is reporting error while I am trying to run "git merge --no-ff <my 
> branch>":
>
> fatal: stash failed.
>
> Please see attached the bug report, the output for same command with 
> trace2 enabled and output for the same command with trace2 and events 
> enabled.
>
> Cheers,
> - Nikolay
Previous: Nikolay ShustovNext: Johannes Schindelin
Message 2 of 6 in “git merge --no-ff failure”
  1. Nikolay ShustovSep 25, 2025
  2. Nikolay ShustovSep 25, 2025
  3. Johannes SchindelinSep 26, 2025
  4. Nikolay ShustovSep 26, 2025
  5. Eric SunshineSep 26, 2025
  6. Nikolay ShustovSep 28, 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.