[PATCH v3 4/5] stash: convert branch to builtin

[Joel Teichroeb]

Add stash branch to the helper and delete the apply_to_branch
function from the shell script.

Signed-off-by: Joel Teichroeb <j...@teichroeb.net>
---
 builtin/stash--helper.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 git-stash.sh            | 17 ++---------------
 2 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c
index 0d7a0d55e..d755faf33 100644
--- a/builtin/stash--helper.c
+++ b/builtin/stash--helper.c
@@ -13,6 +13,7 @@
 static const char * const git_stash_helper_usage[] = {
        N_("git stash--helper drop [-q|--quiet] [<stash>]"),
        N_("git stash--helper apply [--index] [-q|--quiet] [<stash>]"),
+       N_("git stash--helper branch <branchname> [<stash>]"),
        N_("git stash--helper clear"),
        NULL
 };
@@ -27,6 +28,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 * const git_stash_helper_clear_usage[] = {
        N_("git stash--helper clear"),
        NULL
@@ -507,6 +513,45 @@ static int drop_stash(int argc, const char **argv, const 
char *prefix)
        return ret;
 }
 
+static int branch_stash(int argc, const char **argv, const char *prefix)
+{
+       const char *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)
+               return error(_("No branch name specified"));
+
+       branch = argv[0];
+
+       if (get_stash_info(&info, argc - 1, argv + 1))
+               return -1;
+
+       argv_array_pushl(&args, "checkout", "-b", NULL);
+       argv_array_push(&args, branch);
+       argv_array_push(&args, oid_to_hex(&info.b_commit));
+       ret = cmd_checkout(args.argc, args.argv, prefix);
+       if (ret) {
+               free_stash_info(&info);
+               return -1;
+       }
+
+       ret = do_apply_stash(prefix, &info, 1);
+       if (!ret && info.is_stash_ref)
+               ret = do_drop_stash(prefix, &info);
+
+       free_stash_info(&info);
+
+       return ret;
+}
+
 int cmd_stash__helper(int argc, const char **argv, const char *prefix)
 {
        int result = 0;
@@ -533,6 +578,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], "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 0b8f07b38..c5fd4c6c4 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -598,20 +598,6 @@ drop_stash () {
        clear_stash
 }
 
-apply_to_branch () {
-       test -n "$1" || die "$(gettext "No branch name specified")"
-       branch=$1
-       shift 1
-
-       set -- --index "$@"
-       assert_stash_like "$@"
-
-       git checkout -b $branch $REV^ &&
-       apply_stash "$@" && {
-               test -z "$IS_STASH_REF" || drop_stash "$@"
-       }
-}
-
 test "$1" = "-p" && set "push" "$@"
 
 PARSE_CACHE='--not-parsed'
@@ -672,7 +658,8 @@ pop)
        ;;
 branch)
        shift
-       apply_to_branch "$@"
+       cd "$START_DIR"
+       git stash--helper branch "$@"
        ;;
 *)
        case $# in
-- 
2.16.2