Hi Paul,
I think I had revewied these 4 patches before, and I'd wager a bet that
you addressed all of my suggestions, if any.
I had a look over patches 2-4, and want to take a little bit more time
tomorrow to pour over patch 1 (which is a little larger, as it lays a lot
of ground work), to make sure that I cannot find anything else to improve.
Well done so far!
Dscho
On Mon, 25 Jun 2018, Paul-Sebastian Ungureanu wrote:
> From: Joel Teichroeb <joel@xxxxxxxxxxxxx>
>
> Add stash pop to the helper and delete the pop_stash, drop_stash,
> assert_stash_ref functions from the shell script now that they
> are no longer needed.
>
> Signed-off-by: Joel Teichroeb <joel@xxxxxxxxxxxxx>
> Signed-off-by: Paul-Sebastian Ungureanu <ungureanupaulsebastian@xxxxxxxxx>
> ---
> builtin/stash--helper.c | 36 ++++++++++++++++++++++++++++++-
> git-stash.sh | 47 ++---------------------------------------
> 2 files changed, 37 insertions(+), 46 deletions(-)
>
> diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c
> index fbf78249c..a38d6ae8a 100644
> --- a/builtin/stash--helper.c
> +++ b/builtin/stash--helper.c
> @@ -13,7 +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 ( pop | apply ) [--index] [-q|--quiet] [<stash>]"),
> N_("git stash--helper branch <branchname> [<stash>]"),
> N_("git stash--helper clear"),
> NULL
> @@ -24,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
> @@ -528,6 +533,33 @@ 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;
> +
> + assert_stash_ref(&info);
> + if ((ret = do_apply_stash(prefix, &info, index)))
> + printf_ln(_("The stash entry is kept in case you need it again."));
> + else
> + ret = do_drop_stash(prefix, &info);
> +
> + free_stash_info(&info);
> + return ret;
> +}
> +
> static int branch_stash(int argc, const char **argv, const char *prefix)
> {
> const char *branch = NULL;
> @@ -589,6 +621,8 @@ int cmd_stash__helper(int argc, const char **argv, const char *prefix)
> return !!clear_stash(argc, argv, prefix);
> else if (!strcmp(argv[0], "drop"))
> return !!drop_stash(argc, argv, prefix);
> + else if (!strcmp(argv[0], "pop"))
> + return !!pop_stash(argc, argv, prefix);
> else if (!strcmp(argv[0], "branch"))
> return !!branch_stash(argc, argv, prefix);
>
> diff --git a/git-stash.sh b/git-stash.sh
> index 29d9f4425..8f2640fe9 100755
> --- a/git-stash.sh
> +++ b/git-stash.sh
> @@ -554,50 +554,6 @@ assert_stash_like() {
> }
> }
>
> -is_stash_ref() {
> - is_stash_like "$@" && test -n "$IS_STASH_REF"
> -}
> -
> -assert_stash_ref() {
> - is_stash_ref "$@" || {
> - args="$*"
> - die "$(eval_gettext "'\$args' is not a stash reference")"
> - }
> -}
> -
> -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'
> @@ -655,7 +611,8 @@ drop)
> ;;
> pop)
> shift
> - pop_stash "$@"
> + cd "$START_DIR"
> + git stash--helper pop "$@"
> ;;
> branch)
> shift
> --
> 2.18.0.rc2.13.g506fc12fb
>
>
