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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html