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

'git stash' in one subfolder fails because some other subfolder has unmerged files

From
YYuri <yuri@rawbw.com>
Date
Nov 1, 2023, 18:44 UTC
Message-ID
<5c8a94e6-6691-45e6-bcb3-04fa472ae9ad@rawbw.com>
Here is the log:

[yuri@yv /usr/ports/audio/giada]$ git stash push -m "audio/giada: Update to 0.26.0 has run-time issues" -- /usr/ports/audio/gia da audio/triceratops-lv2/Makefile: needs merge audio/triceratops-lv2/pkg-descr: needs merge audio/triceratops-lv2/pkg-plist: needs merge science/py-dftbplus/Makefile: needs merge science/py-dftbplus/distinfo: needs merge science/py-dftbplus/pkg-descr: needs merge

I asked git to stash only the audio/giada subfolder. Unmerged files in science/py-dftbplus and audio/triceratops-lv2 shouldn't prevent stashing files in audio/giada.

I believe that this is a bug.

Thanks, Yuri

Message 1 of 1 in “'git stash' in one subfolder fails because some other subfolder has unmerged files”
  1. YuriNov 1, 2023

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.