kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

stash: convert list to builtin 

Add stash list to the helper and delete the list_stash function
from the shell script.

Signed-off-by: Paul-Sebastian Ungureanu <ungureanupaulsebastian@gmail.com>
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Paul-Sebastian Ungureanu 2019-02-25 23:16:19 +00:00 committed by Junio C Hamano
parent c4de61d7a9
commit 130f2697da
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
builtin/stash--helper.c
View File

@ -12,6 +12,7 @@
#include "rerere.h" #include "rerere.h"


static const char * const git_stash_helper_usage[] = { static const char * const git_stash_helper_usage[] = {
N_("git stash--helper list [<options>]"),
N_("git stash--helper drop [-q|--quiet] [<stash>]"), N_("git stash--helper drop [-q|--quiet] [<stash>]"),
N_("git stash--helper ( pop | apply ) [--index] [-q|--quiet] [<stash>]"), N_("git stash--helper ( pop | apply ) [--index] [-q|--quiet] [<stash>]"),
N_("git stash--helper branch <branchname> [<stash>]"), N_("git stash--helper branch <branchname> [<stash>]"),
@ -19,6 +20,11 @@ static const char * const git_stash_helper_usage[] = {
NULL NULL
}; };


static const char * const git_stash_helper_list_usage[] = {
N_("git stash--helper list [<options>]"),
NULL
};

static const char * const git_stash_helper_drop_usage[] = { static const char * const git_stash_helper_drop_usage[] = {
N_("git stash--helper drop [-q|--quiet] [<stash>]"), N_("git stash--helper drop [-q|--quiet] [<stash>]"),
NULL NULL
@ -615,6 +621,29 @@ static int branch_stash(int argc, const char **argv, const char *prefix)
return ret; return ret;
} }


static int list_stash(int argc, const char **argv, const char *prefix)
{
struct child_process cp = CHILD_PROCESS_INIT;
struct option options[] = {
OPT_END()
};

argc = parse_options(argc, argv, prefix, options,
git_stash_helper_list_usage,
PARSE_OPT_KEEP_UNKNOWN);

if (!ref_exists(ref_stash))
return 0;

cp.git_cmd = 1;
argv_array_pushl(&cp.args, "log", "--format=%gd: %gs", "-g",
"--first-parent", "-m", NULL);
argv_array_pushv(&cp.args, argv);
argv_array_push(&cp.args, ref_stash);
argv_array_push(&cp.args, "--");
return run_command(&cp);
}

int cmd_stash__helper(int argc, const char **argv, const char *prefix) int cmd_stash__helper(int argc, const char **argv, const char *prefix)
{ {
pid_t pid = getpid(); pid_t pid = getpid();
@ -645,6 +674,8 @@ int cmd_stash__helper(int argc, const char **argv, const char *prefix)
return !!pop_stash(argc, argv, prefix); return !!pop_stash(argc, argv, prefix);
else if (!strcmp(argv[0], "branch")) else if (!strcmp(argv[0], "branch"))
return !!branch_stash(argc, argv, prefix); return !!branch_stash(argc, argv, prefix);
else if (!strcmp(argv[0], "list"))
return !!list_stash(argc, argv, prefix);


usage_msg_opt(xstrfmt(_("unknown subcommand: %s"), argv[0]), usage_msg_opt(xstrfmt(_("unknown subcommand: %s"), argv[0]),
git_stash_helper_usage, options); git_stash_helper_usage, options);

7
git-stash.sh
View File

@ -399,11 +399,6 @@ have_stash () {
git rev-parse --verify --quiet $ref_stash >/dev/null git rev-parse --verify --quiet $ref_stash >/dev/null
} }


list_stash () {
have_stash || return 0
git log --format="%gd: %gs" -g --first-parent -m "$@" $ref_stash --
}

show_stash () { show_stash () {
ALLOW_UNKNOWN_FLAGS=t ALLOW_UNKNOWN_FLAGS=t
assert_stash_like "$@" assert_stash_like "$@"
@ -591,7 +586,7 @@ test -n "$seen_non_option" || set "push" "$@"
case "$1" in case "$1" in
list) list)
shift shift
list_stash "$@" git stash--helper list "$@"
;; ;;
show) show)
shift shift