From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 22 Oct 2018 22:15:05 +0000 (-0700)
Subject: rebase (autostash): use an explicit OID to apply the stash
X-Git-Tag: v2.20.0-rc0~85^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b98e914e4650b876b9049bff1a5a33f4bfda0e0a;p=thirdparty%2Fgit.git

rebase (autostash): use an explicit OID to apply the stash

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.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reviewed-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/rebase.c b/builtin/rebase.c
index cd6beb96b4..e9995c9a37 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -252,6 +252,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 mistaken for a number */
+	strbuf_addstr(&autostash, "^0");
 	argv_array_pushl(&stash_apply.args,
 			 "stash", "apply", autostash.buf, NULL);
 	stash_apply.git_cmd = 1;