From: Johannes Schindelin Date: Mon, 22 Oct 2018 22:15:03 +0000 (-0700) Subject: rebase (autostash): store the full OID in /autostash X-Git-Tag: v2.20.0-rc0~85^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=12aeb00a22e589f85e26da833e05bb1a7e412d07;p=thirdparty%2Fgit.git rebase (autostash): store the full OID in /autostash It was reported by Gábor Szeder and analyzed by Alban Gruin that the built-in rebase stores only abbreviated stash hashes in the `autostash` file. This is problematic e.g. in t5520-pull.sh, where the abbreviated hash is so short that it sometimes consists only of digits, which are subsequently mistaken ("DWIMmed") for numbers by `git stash apply`. Let's align the behavior of the built-in rebase with the scripted rebase and store the full stash hash instead. That makes it a lot less likely that it consists only of digits. Signed-off-by: Johannes Schindelin Reviewed-by: SZEDER Gábor Signed-off-by: Junio C Hamano --- diff --git a/builtin/rebase.c b/builtin/rebase.c index 42f320453a..cd6beb96b4 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1374,7 +1374,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) if (safe_create_leading_directories_const(autostash)) die(_("Could not create directory for '%s'"), options.state_dir); - write_file(autostash, "%s", buf.buf); + write_file(autostash, "%s", oid_to_hex(&oid)); printf(_("Created autostash: %s\n"), buf.buf); if (reset_head(&head->object.oid, "reset --hard", NULL, 0, NULL, NULL) < 0)