From: Joel Teichroeb <joel@teichroeb.net>
To: Git Mailing List <git@vger.kernel.org>,
Thomas Gummerer <t.gummerer@gmail.com>,
Christian Couder <christian.couder@gmail.com>,
Eric Sunshine <sunshine@sunshineco.com>
Cc: Joel Teichroeb <joel@teichroeb.net>
Subject: [PATCH v2 6/6] stash: convert pop to builtin
Date: Sun, 25 Mar 2018 18:14:26 -0700 [thread overview]
Message-ID: <20180326011426.19159-7-joel@teichroeb.net> (raw)
In-Reply-To: <20180326011426.19159-1-joel@teichroeb.net>
Signed-off-by: Joel Teichroeb <joel@teichroeb.net>
---
builtin/stash--helper.c | 41 +++++++++++++++++++++++++++++++++++++++++
git-stash.sh | 39 ++++-----------------------------------
2 files changed, 45 insertions(+), 35 deletions(-)
diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c
index 4226c13be3..36e7e660a0 100644
--- a/builtin/stash--helper.c
+++ b/builtin/stash--helper.c
@@ -12,6 +12,7 @@
static const char * const git_stash_helper_usage[] = {
N_("git stash--helper drop [-q|--quiet] [<stash>]"),
+ N_("git stash--helper pop [--index] [-q|--quiet] [<stash>]"),
N_("git stash--helper apply [--index] [-q|--quiet] [<stash>]"),
N_("git stash--helper branch <branchname> [<stash>]"),
N_("git stash--helper clear"),
@@ -23,6 +24,11 @@ static const char * const git_stash_helper_drop_usage[] = {
NULL
};
+static const char * const git_stash_helper_pop_usage[] = {
+ N_("git stash--helper pop [--index] [-q|--quiet] [<stash>]"),
+ NULL
+};
+
static const char * const git_stash_helper_apply_usage[] = {
N_("git stash--helper apply [--index] [-q|--quiet] [<stash>]"),
NULL
@@ -502,6 +508,39 @@ static int drop_stash(int argc, const char **argv, const char *prefix)
return ret;
}
+static int pop_stash(int argc, const char **argv, const char *prefix)
+{
+ int index = 0, ret;
+ struct stash_info info;
+ struct option options[] = {
+ OPT__QUIET(&quiet, N_("be quiet, only report errors")),
+ OPT_BOOL(0, "index", &index,
+ N_("attempt to recreate the index")),
+ OPT_END()
+ };
+
+ argc = parse_options(argc, argv, prefix, options,
+ git_stash_helper_pop_usage, 0);
+
+ if (get_stash_info(&info, argc, argv))
+ return -1;
+
+ if (assert_stash_ref(&info)) {
+ destroy_stash_info(&info);
+ return -1;
+ }
+
+ if (do_apply_stash(prefix, &info, index)) {
+ printf_ln(_("The stash entry is kept in case you need it again."));
+ destroy_stash_info(&info);
+ return -1;
+ }
+
+ ret = do_drop_stash(prefix, &info);
+ destroy_stash_info(&info);
+ return ret;
+}
+
static int branch_stash(int argc, const char **argv, const char *prefix)
{
const char *branch = NULL;
@@ -567,6 +606,8 @@ int cmd_stash__helper(int argc, const char **argv, const char *prefix)
result = clear_stash(argc, argv, prefix);
else if (!strcmp(argv[0], "drop"))
result = drop_stash(argc, argv, prefix);
+ else if (!strcmp(argv[0], "pop"))
+ result = pop_stash(argc, argv, prefix);
else if (!strcmp(argv[0], "branch"))
result = branch_stash(argc, argv, prefix);
else {
diff --git a/git-stash.sh b/git-stash.sh
index c5fd4c6c44..1b8c7c4f63 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -565,39 +565,6 @@ assert_stash_ref() {
}
}
-apply_stash () {
- cd "$START_DIR"
- git stash--helper apply "$@"
- res=$?
- cd_to_toplevel
- return $res
-}
-
-pop_stash() {
- assert_stash_ref "$@"
-
- if apply_stash "$@"
- then
- drop_stash "$@"
- else
- status=$?
- say "$(gettext "The stash entry is kept in case you need it again.")"
- exit $status
- fi
-}
-
-drop_stash () {
- assert_stash_ref "$@"
-
- git reflog delete --updateref --rewrite "${REV}" &&
- say "$(eval_gettext "Dropped \${REV} (\$s)")" ||
- die "$(eval_gettext "\${REV}: Could not drop stash entry")"
-
- # clear_stash if we just dropped the last stash entry
- git rev-parse --verify --quiet "$ref_stash@{0}" >/dev/null ||
- clear_stash
-}
-
test "$1" = "-p" && set "push" "$@"
PARSE_CACHE='--not-parsed'
@@ -634,7 +601,8 @@ push)
;;
apply)
shift
- apply_stash "$@"
+ cd "$START_DIR"
+ git stash--helper apply "$@"
;;
clear)
shift
@@ -654,7 +622,8 @@ drop)
;;
pop)
shift
- pop_stash "$@"
+ cd "$START_DIR"
+ git stash--helper pop "$@"
;;
branch)
shift
--
2.16.2
prev parent reply other threads:[~2018-03-26 1:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-26 1:14 [PATCH v2 0/6] Convert some stash functionality to a builtin Joel Teichroeb
2018-03-26 1:14 ` [PATCH v2 1/6] stash: Add tests for passing in too many refs Joel Teichroeb
2018-03-26 19:21 ` Johannes Schindelin
2018-03-26 1:14 ` [PATCH v2 2/6] stash: Add test for branch with no arguments Joel Teichroeb
2018-03-26 1:14 ` [PATCH v2 3/6] stash: convert apply to builtin Joel Teichroeb
2018-03-26 7:05 ` Christian Couder
2018-03-28 3:32 ` Joel Teichroeb
2018-03-26 1:14 ` [PATCH v2 4/6] stash: convert drop and clear " Joel Teichroeb
2018-03-26 1:14 ` [PATCH v2 5/6] stash: convert branch " Joel Teichroeb
2018-03-26 1:14 ` Joel Teichroeb [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180326011426.19159-7-joel@teichroeb.net \
--to=joel@teichroeb.net \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=sunshine@sunshineco.com \
--cc=t.gummerer@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).