---
builtin/stash--helper.c | 93 +
git-stash.sh| 4 +--
2 files changed, 95 insertions(+), 2 deletions(-)
diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c
index 18c4aba665..1598b82ac2 100644
--- a/builtin/stash--helper.c
+++ b/builtin/stash--helper.c
@@ -11,8 +11,15 @@
#include "dir.h"
static const char * const git_stash_helper_usage[] = {
+ N_("git stash--helper drop [-q|--quiet] []"),
N_("git stash--helper apply [--index] [-q|--quiet] []"),
N_("git stash--helper branch []"),
+ N_("git stash--helper clear"),
+ NULL
+};
+
+static const char * const git_stash_helper_drop_usage[] = {
+ N_("git stash--helper drop [-q|--quiet] []"),
NULL
};
@@ -26,6 +33,11 @@ static const char * const git_stash_helper_branch_usage[] = {
NULL
};
+static const char * const git_stash_helper_clear_usage[] = {
+ N_("git stash--helper clear"),
+ NULL
+};
+
static const char *ref_stash = "refs/stash";
static int quiet;
static char stash_index_path[PATH_MAX];
@@ -114,6 +126,29 @@ static int get_stash_info(struct stash_info *info, const
char *commit)
return 0;
}
+static int do_clear_stash(void)
+{
+ struct object_id obj;
+ if (get_oid(ref_stash, &obj))
+ return 0;
+
+ return delete_ref(NULL, ref_stash, &obj, 0);
+}
+
+static int clear_stash(int argc, const char **argv, const char *prefix)
+{
+ struct option options[] = {
+ OPT_END()
+ };
+
+ argc = parse_options(argc, argv, prefix, options,
git_stash_helper_clear_usage, PARSE_OPT_STOP_AT_NON_OPTION);
+
+ if (argc != 0)
+ return error(_("git stash--helper clear with parameters is
unimplemented"));
+
+ return do_clear_stash();
+}
+
static int reset_tree(struct object_id i_tree, int update, int reset)
{
struct unpack_trees_options opts;
@@ -313,6 +348,60 @@ static int apply_stash(int argc, const char **argv, const
char *prefix)
return do_apply_stash(prefix, &info, index);
}
+static int do_drop_stash(const char *prefix, struct stash_info *info)
+{
+ struct argv_array args = ARGV_ARRAY_INIT;
+ int ret;
+ struct child_process cp = CHILD_PROCESS_INIT;
+
+ argv_array_pushl(&args, "reflog", "delete", "--updateref", "--rewrite",
NULL);
+ argv_array_push(&args, info->revision);
+ ret = cmd_reflog(args.argc, args.argv, prefix);
+ if (!ret) {
+ if (!quiet) {
+ printf(_("Dropped %s (%s)\n"), info->revision,
sha1_to_hex(info->w_commit.hash));
+ }
+ } else {
+ return error(_("%s: Could not drop stash entry"),
info->revision);
+ }
+
+ cp.git_cmd = 1;
+ /* Even though --quiet is specified, rev-parse still outputs the hash */
+ cp.no_stdout = 1;
+ argv_array_pushl(&cp.args, "rev-parse", "--verify", "--quiet", NULL);
+ argv_array_pushf(&cp.args, "%s@{0}", ref_stash);
+ ret = run_command(&cp);
+
+ if (ret)
+ do_clear_stash();
+
+ return 0;
+}
+
+static int drop_stash(int argc, const char **argv, const char *prefix)
+{
+ const char *commit = NULL;
+ struct stash_info info;
+ struct option options[] = {
+ OPT__QUIET(&quiet, N_("be quiet, only report errors")),
+ OPT_END()
+ };
+
+ argc = parse_options(argc, argv, prefix, options,
+ git_stash_helper_drop_usage, 0);
+
+ if (argc == 1)
+ commit = argv[0];
+
+ if (get_stash_info(&info, commit))
+ return -1;
+
+ if (!info.is_stash_ref)
+ return error(_("'%s' is not a stash reference"), commit);
+
+ return do_drop_stash(prefix, &info);
+}
+
static int branch_stash(int argc, const char **argv, const char *prefix)
{
const char *commit = NULL, *branch = NULL;
@@ -371,6 +460,10 @@ 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], "clear"))
+ 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 {
diff --git a/git-stash.sh b/git-stash.sh
index 360643ad4e..54d0a6c21f 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -716,7 +716,7 @@ apply)
;;
clear)
shift
- clear_stash "$@"
+ git stash--helper clear "$@"
;;
create)
shift
@@ -728,7 +728,7 @@ store)
;;
drop)
shift
- drop_stash "$@"
+ git stash--helper drop "$@"
;;
pop)
shift
--
2.16