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

Re: [BUG] assertion failure in builtin-mv.c with "git mv -k"

From
Jeff King <peff@peff.net>
Date
Jan 14, 2009, 16:47 UTC
Message-ID
<20090114164742.GA15758@coredump.intra.peff.net>
In-Reply-To
<496E0D1C.20807@drmicha.warpmail.net>
On Wed, Jan 14, 2009 at 05:04:44PM +0100, Michael J Gruber wrote:
Show 9 quoted lines
> It was a lame attempt at getting around it, it's just one line... I
> didn't know I've been being noticed long enough ;)
> So, should I prepare a series like:
> 
> 1: test case and mark known fail
> 2: the 1 line fix
> 3: mark test pass
> 
> Or should 2+3 be squashed into one?

Definitely the fix and marking the test as passing should be one patch, since then you see that it is the fix which causes the test to pass. But really, for a simple fix I usually just squash it all into a single patch. Then somebody looking at the patch later says "Oh, this is what was broken, and here is how it was fixed."

-Peff
Previous: Michael J GruberNext: Junio C Hamano
Message 5 of 14 in “[BUG] assertion failure in builtin-mv.c with "git mv -k"”
  1. Matthieu MoyJan 14, 2009
  2. Michael J GruberJan 14, 2009
  3. Johannes SchindelinJan 14, 2009
  4. Michael J GruberJan 14, 2009
  5. Jeff KingJan 14, 2009
  6. Junio C HamanoJan 14, 2009
  7. Michael J GruberJan 15, 2009
  8. Junio C HamanoJan 15, 2009
  9. Matthieu MoyJan 16, 2009
  10. 0/3 Add test cases for "git mv -k" and fix a known breakage.Michael J Gruber, Jan 14, 2009
  11. 1/3 add test cases for "git mv -k"Michael J Gruber, Jan 14, 2009
  12. 2/3 fix handling of multiple untracked files for git mv -kMichael J Gruber, Jan 14, 2009
  13. 3/3 mark fixed breakage as expect pass for "git mv -k" multiple filesMichael J Gruber, Jan 14, 2009
  14. fix handling of multiple untracked files for git mv -kMichael J Gruber, Jan 14, 2009

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.