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

Re: [PATCH v5 1/7] reset: do not accept a mixed reset in a .git dir

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 15, 2009, 20:25 UTC
Message-ID
<7vk4woyogb.fsf@alter.siamese.dyndns.org>
In-Reply-To
<7vskbcyot5.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
Show 6 quoted lines
>> The reason is that after the next patch, it will not fail in a bare 
>> repository,...
>
> That sounds as if you want to change the definition of what the expected
> behaviour is early, because you want to claim a regression you will later
> introduce is not a regression.  I hope that is not the case.
Hmm...

By "after the next patch, it will not fail in a bare repository", did you mean "if the next patch blindly replaced an external call to read-tree with an internal call to unpack_trees(), it will change the behaviour, and we will end up allowing '--mixed in bare'. To prevent it from happening, cmd_reset() should check that condition upfront"?

Then you were not trying to hide regressions (which makes me happier). But then doesn't the change belong to the next patch, not this one?

Previous: Junio C HamanoNext: Christian Couder
Message 6 of 18 in “"git reset --merge" related improvements”
  1. 0/7 "git reset --merge" related improvementsChristian Couder, Dec 12, 2009
  2. 1/7 reset: do not accept a mixed reset in a .git dirChristian Couder, Dec 12, 2009
  3. Junio C HamanoDec 12, 2009
  4. Christian CouderDec 15, 2009
  5. Junio C HamanoDec 15, 2009
  6. Junio C HamanoDec 15, 2009
  7. Christian CouderDec 16, 2009
  8. Junio C HamanoDec 15, 2009
  9. 2/7 reset: add a few tests for "git reset --merge"Christian Couder, Dec 12, 2009
  10. Junio C HamanoDec 12, 2009
  11. 3/7 reset: use "unpack_trees()" directly instead of "git read-tree"Christian Couder, Dec 12, 2009
  12. Junio C HamanoDec 12, 2009
  13. 4/7 reset: add option "--keep" to "git reset"Christian Couder, Dec 12, 2009
  14. Junio C HamanoDec 12, 2009
  15. Christian CouderDec 30, 2009
  16. 5/7 reset: add test cases for "--keep" optionChristian Couder, Dec 12, 2009
  17. 6/7 Documentation: reset: describe new "--keep" optionChristian Couder, Dec 12, 2009
  18. 7/7 Documentation: reset: add some tables to describe the different optionsChristian Couder, Dec 12, 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.