We plan to edit pop_stash later, so let's make it a first class
command by giving its own implementation function.
Signed-off-by: Jon Seymour <jon.seymour@xxxxxxxxx>
---
git-stash.sh | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/git-stash.sh b/git-stash.sh
index 1d95447..31ea333 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -323,6 +323,13 @@ apply_stash () {
fi
}
+pop_stash() {
+ if apply_stash "$@"
+ then
+ drop_stash "$applied_stash"
+ fi
+}
+
drop_stash () {
have_stash || die 'No stash entries to drop'
@@ -422,10 +429,7 @@ drop)
;;
pop)
shift
- if apply_stash "$@"
- then
- drop_stash "$applied_stash"
- fi
+ pop_stash "$@"
;;
branch)
shift
--
1.6.5.rc3.8.g8ba5e
--
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