Re: [PATCH v2 3/3] rebase (autostash): use an explicit OID to apply the stash
On Mon, Oct 22, 2018 at 03:15:05PM -0700, Johannes Schindelin via GitGitGadget wrote:
Show 10 quoted lines
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> When `git stash apply <argument>` sees an argument that consists only of
> digits, it tries to be smart and interpret it as `stash@{<number>}`.
>
> Unfortunately, an all-digit hash (which is unlikely but still possible)
> is therefore misinterpreted as `stash@{<n>}` reflog.
>
> To prevent that from happening, let's append `^0` after the stash hash,
> to make sure that it is interpreted as an OID rather than as a number.Oh, this is clever.
FWIW, all patches look good to me, barring the typo below.
Show 14 quoted lines
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> builtin/rebase.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index 418624837..30d58118c 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -253,6 +253,8 @@ static int apply_autostash(struct rebase_options *opts)
>
> if (read_one(path, &autostash))
> return error(_("Could not read '%s'"), path);
> + /* Ensure that the hash is not mistake for a number */Show 6 quoted lines
> + strbuf_addstr(&autostash, "^0");
> argv_array_pushl(&stash_apply.args,
> "stash", "apply", autostash.buf, NULL);
> stash_apply.git_cmd = 1;
> --
> gitgitgadget
SZEDER Gábor <szeder.dev@gmail.com>