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

[PATCH v6 0/9] detached-stash: regularise handling of stash arguments by git stash

From
Jon Seymour <jon.seymour@gmail.com>
Date
Aug 21, 2010, 04:08 UTC
Message-ID
<1282363744-4924-1-git-send-email-jon.seymour@gmail.com>
This patch introduces a common flags and revision parsing function to the following git stash commands:
 * apply
 * branch
 * pop
 * drop
 * show
With these changes, git stash now:
 * allows non-stash log entry references to passed to 'stash branch' provided they are stash-like
 * relaxes the requirement that a stash log currently entry exists for 'stash show' or 'stash branch' 
 * does not attempt to drop the specified revision if it doesn't look like a stash log entry reference
 * fails 'stash pop' and 'stash drop' early if the specified revision is not a stash log entry reference
 * fails early if more than one stash-like commit is specified
 * fails early if the specified revision is of the form ref@{n} and ref exists, but ref@{n} does not exist
 * reports various error conditions that can occur across multiple commands with consistent error messages.

The implementation of several commands is simplified to a lesser or greater degree by taking advantage of the new common parsing and validation function, parse_flags_and_rev().

This revision incorporates feedback and corrections from Johannes Sixt and Junio Hamano. 

Version 5 differed from Version 4 by introducing a common parsing function and refactoring to take advantage of that.

Version 6 differs from Version 5 by cleaning up and rationalising the new tests and splitting out a commit (2/9) that is only required to work around an issue with git rev-parse.

2/9 of this series may be elided if this series is applied on top of the series:
   "rev-parse: improve reporting of invalid log references"
Jon Seymour (9):
  detached-stash: introduce parse_flags_and_revs function
  detached-stash: work around git rev-parse failure to detect bad log refs
  detached-stash: simplify stash_apply
  detached-stash: simplify stash_drop
  detached-stash: refactor git stash pop implementation
  detached-stash: simplify git stash branch
  detached-stash: simplify git stash show
  detached-stash: tests of git stash with stash-like arguments
  detached-stash: update Documentation
 Documentation/git-stash.txt |   16 ++-
 git-stash.sh                |  223 ++++++++++++++++++++++++++++---------------
 t/t3903-stash.sh            |  112 ++++++++++++++++++++++
 3 files changed, 268 insertions(+), 83 deletions(-)
-- 
1.7.2.1.110.g34f32
Next: Jon Seymour
Message 1 of 12 in “detached-stash: regularise handling of stash arguments by git stash”
  1. 0/9 detached-stash: regularise handling of stash arguments by git stashJon Seymour, Aug 21, 2010
  2. 1/9 detached-stash: introduce parse_flags_and_revs functionJon Seymour, Aug 21, 2010
  3. 1/9 detached-stash: introduce parse_flags_and_revs functionJon Seymour, Aug 21, 2010
  4. 2/9 detached-stash: work around git rev-parse failure to detect bad log refsJon Seymour, Aug 21, 2010
  5. 2/9 detached-stash: work around git rev-parse failure to detect bad log refsJon Seymour, Aug 21, 2010
  6. 3/9 detached-stash: simplify stash_applyJon Seymour, Aug 21, 2010
  7. 4/9 detached-stash: simplify stash_dropJon Seymour, Aug 21, 2010
  8. 5/9 detached-stash: refactor git stash pop implementationJon Seymour, Aug 21, 2010
  9. 6/9 detached-stash: simplify git stash branchJon Seymour, Aug 21, 2010
  10. 7/9 detached-stash: simplify git stash showJon Seymour, Aug 21, 2010
  11. 8/9 detached-stash: tests of git stash with stash-like argumentsJon Seymour, Aug 21, 2010
  12. 9/9 detached-stash: update DocumentationJon Seymour, Aug 21, 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.