From: Joel Teichroeb <joel@teichroeb.net>
To: Git Mailing List <git@vger.kernel.org>,
Thomas Gummerer <t.gummerer@gmail.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Joel Teichroeb <joel@teichroeb.net>
Subject: [PATCH 2/4] stash: convert branch to builtin
Date: Sat, 24 Mar 2018 10:37:05 -0700 [thread overview]
Message-ID: <20180324173707.17699-3-joel@teichroeb.net> (raw)
In-Reply-To: <20180324173707.17699-1-joel@teichroeb.net>
---
builtin/stash--helper.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
git-stash.sh | 3 ++-
2 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c
index e9a9574f40..18c4aba665 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 apply [--index] [-q|--quiet] [<stash>]"),
+ N_("git stash--helper branch <branchname> [<stash>]"),
NULL
};
@@ -20,6 +21,11 @@ static const char * const git_stash_helper_apply_usage[] = {
NULL
};
+static const char * const git_stash_helper_branch_usage[] = {
+ N_("git stash--helper branch <branchname> [<stash>]"),
+ NULL
+};
+
static const char *ref_stash = "refs/stash";
static int quiet;
static char stash_index_path[PATH_MAX];
@@ -307,6 +313,42 @@ static int apply_stash(int argc, const char **argv, const char *prefix)
return do_apply_stash(prefix, &info, index);
}
+static int branch_stash(int argc, const char **argv, const char *prefix)
+{
+ const char *commit = NULL, *branch = NULL;
+ int ret;
+ struct argv_array args = ARGV_ARRAY_INIT;
+ struct stash_info info;
+ struct option options[] = {
+ OPT_END()
+ };
+
+ argc = parse_options(argc, argv, prefix, options,
+ git_stash_helper_branch_usage, 0);
+
+ if (argc != 0) {
+ branch = argv[0];
+ if (argc == 2)
+ commit = argv[1];
+ }
+
+ if (get_stash_info(&info, commit))
+ return -1;
+
+ argv_array_pushl(&args, "checkout", "-b", NULL);
+ argv_array_push(&args, branch);
+ argv_array_push(&args, sha1_to_hex(info.b_commit.hash));
+ ret = cmd_checkout(args.argc, args.argv, prefix);
+ if (ret)
+ return -1;
+
+ ret = do_apply_stash(prefix, &info, 1);
+ if (!ret && info.is_stash_ref)
+ ret = do_drop_stash(prefix, &info);
+
+ return ret;
+}
+
int cmd_stash__helper(int argc, const char **argv, const char *prefix)
{
int result = 0;
@@ -329,6 +371,8 @@ int cmd_stash__helper(int argc, const char **argv, const char *prefix)
usage_with_options(git_stash_helper_usage, options);
else if (!strcmp(argv[0], "apply"))
result = apply_stash(argc, argv, prefix);
+ else if (!strcmp(argv[0], "branch"))
+ result = branch_stash(argc, argv, prefix);
else {
error(_("unknown subcommand: %s"), argv[0]);
usage_with_options(git_stash_helper_usage, options);
diff --git a/git-stash.sh b/git-stash.sh
index 92c084eb17..360643ad4e 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -736,7 +736,8 @@ pop)
;;
branch)
shift
- apply_to_branch "$@"
+ cd "$START_DIR"
+ git stash--helper branch "$@"
;;
*)
case $# in
--
2.16.2
next prev parent reply other threads:[~2018-03-24 17:37 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-24 17:37 [PATCH 0/4] Convert some stash functionality to a builtin Joel Teichroeb
2018-03-24 17:37 ` [PATCH 1/4] stash: convert apply to builtin Joel Teichroeb
2018-03-24 18:19 ` Christian Couder
2018-03-25 6:40 ` Eric Sunshine
2018-03-25 9:27 ` Christian Couder
2018-03-25 8:09 ` Christian Couder
2018-03-25 16:51 ` Joel Teichroeb
2018-03-25 19:58 ` Christian Couder
[not found] ` <20180325204653.1470-1-avarab@gmail.com>
2018-03-25 20:57 ` [PATCH] Remove contrib/examples/* Ævar Arnfjörð Bjarmason
2018-03-26 6:01 ` Jeff King
2018-03-26 20:58 ` Junio C Hamano
2018-03-25 16:43 ` [PATCH 1/4] stash: convert apply to builtin Thomas Gummerer
2018-03-28 3:30 ` Joel Teichroeb
2018-03-25 17:23 ` Thomas Gummerer
2018-03-24 17:37 ` Joel Teichroeb [this message]
2018-03-25 6:44 ` [PATCH 2/4] stash: convert branch " Eric Sunshine
2018-03-25 8:22 ` Christian Couder
2018-03-25 17:02 ` Thomas Gummerer
2018-03-24 17:37 ` [PATCH 3/4] stash: convert drop and clear " Joel Teichroeb
2018-03-24 18:22 ` Christian Couder
2018-03-25 6:49 ` Eric Sunshine
2018-03-24 17:37 ` [PATCH 4/4] stash: convert pop " Joel Teichroeb
2018-03-25 6:51 ` Eric Sunshine
2018-03-25 17:36 ` Thomas Gummerer
2018-03-25 17:39 ` [PATCH 0/4] Convert some stash functionality to a builtin Thomas Gummerer
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=20180324173707.17699-3-joel@teichroeb.net \
--to=joel@teichroeb.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--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).