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

[PATCH v4 0/9] stash: modifiy handling of stash-like references

From
Jon Seymour <jon.seymour@gmail.com>
Date
Aug 10, 2010, 00:04 UTC
Message-ID
<1281398688-21008-1-git-send-email-jon.seymour@gmail.com>
In-Reply-To
<1281242771-24764-1-git-send-email-jon.seymour@gmail.com>

This series teaches git stash branch and git stash show to be more tolerant of stash-like references that are not actually stash entry references, while teaching git stash pop and git stash drop to be less tolerant of stash-like references that are not actually stash entry references.

Junio: I did not adopt your suggestion to make git stash drop more tolerant
of invalid stash references since failing early might help a user
to spot an incorrect assumption about the state of their working tree
and stash stack - silently handling this case might hide such an incorrect
assumption. However, if you would prefer git stash drop to behave that
way, I'll rework the series accordingly.

The first 3 commits refactor the existing code without significantly changing existing behaviour.

The next 4 commits modify existing behaviour to be more (or less) tolerant of stash-like references, as required.

The last 2 commits update the tests and documentation to reflect the modified behaviour.
Thanks to Johannes Sixt for suggesting improvements to the tests.

This series in unchanged from v3 except for patch 8 which improves the tests and patch 9 which enhances the documentation to indicate which commands require a stash entry reference and which are happy to use just a stash-like commit.

Jon Seymour (9):
  stash: refactor - create pop_stash function
  stash: extract stash-like check into its own function
  stash: introduce is_stash_ref and assert_stash_ref functions.
  stash: teach git stash pop to fail early if the argument is not a
    stash ref
  stash: teach git stash drop to fail early if the specified revision
    is not a stash reference
  stash: teach git stash branch to tolerate stash-like arguments
  stash: teach git stash show to always tolerate stash-like arguments.
  t3903-stash.sh: tests of git stash with stash-like arguments
  Documentation: git stash branch now tolerates non-stash references.
 Documentation/git-stash.txt |   37 +++++++++--------
 git-stash.sh                |   92 +++++++++++++++++++++++++++++++------------
 t/t3903-stash.sh            |   77 ++++++++++++++++++++++++++++++++++++
 3 files changed, 163 insertions(+), 43 deletions(-)
Previous: Jon SeymourNext: Jon Seymour
Message 14 of 30 in “stash: modifiy handling of stash-like references”
  1. 0/9 stash: modifiy handling of stash-like referencesJon Seymour, Aug 8, 2010
  2. 1/9 stash: refactor - create pop_stash functionJon Seymour, Aug 8, 2010
  3. 2/9 stash: extract stash-like check into its own functionJon Seymour, Aug 8, 2010
  4. 3/9 stash: introduce is_stash_ref and assert_stash_ref functions.Jon Seymour, Aug 8, 2010
  5. 4/9 stash: teach git stash pop to fail early if the argument is not a stash refJon Seymour, Aug 8, 2010
  6. 5/9 stash: teach git stash drop to fail early if the specified revision is not a stash referenceJon Seymour, Aug 8, 2010
  7. 6/9 stash: teach git stash branch to tolerate stash-like argumentsJon Seymour, Aug 8, 2010
  8. 7/9 stash: teach git stash show to always tolerate stash-like arguments.Jon Seymour, Aug 8, 2010
  9. 8/9 t3903-stash.sh: tests of git stash with stash-like argumentsJon Seymour, Aug 8, 2010
  10. Johannes SixtAug 8, 2010
  11. Jon SeymourAug 8, 2010
  12. 9/9 Documentation: git stash branch now tolerates non-stash references.Jon Seymour, Aug 8, 2010
  13. Jon SeymourAug 8, 2010
  14. 0/9 stash: modifiy handling of stash-like referencesJon Seymour, Aug 10, 2010
  15. 1/9 stash: refactor - create pop_stash functionJon Seymour, Aug 10, 2010
  16. 2/9 stash: extract stash-like check into its own functionJon Seymour, Aug 10, 2010
  17. Junio C HamanoAug 13, 2010
  18. Jon SeymourAug 13, 2010
  19. 3/9 stash: introduce is_stash_ref and assert_stash_ref functions.Jon Seymour, Aug 10, 2010
  20. Junio C HamanoAug 13, 2010
  21. Jon SeymourAug 14, 2010
  22. 4/9 stash: teach git stash pop to fail early if the argument is not a stash refJon Seymour, Aug 10, 2010
  23. 5/9 stash: teach git stash drop to fail early if the specified revision is not a stash referenceJon Seymour, Aug 10, 2010
  24. 6/9 stash: teach git stash branch to tolerate stash-like argumentsJon Seymour, Aug 10, 2010
  25. 7/9 stash: teach git stash show to always tolerate stash-like arguments.Jon Seymour, Aug 10, 2010
  26. Junio C HamanoAug 13, 2010
  27. 8/9 t3903-stash.sh: tests of git stash with stash-like argumentsJon Seymour, Aug 10, 2010
  28. 9/9 Documentation: git stash branch now tolerates non-stash references.Jon Seymour, Aug 10, 2010
  29. Junio C HamanoAug 13, 2010
  30. Jon SeymourAug 14, 2010

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.