| commit | 12aeb00a22e589f85e26da833e05bb1a7e412d07 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Mon, 22 Oct 2018 22:15:03 +0000 (22 15:15 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 23 Oct 2018 04:17:08 +0000 (23 13:17 +0900) | ||
| tree | 328214da4651d140957cca8673c432a3088569dd | treesnapshot (tar.gz zip) |
| parent | 71064e6008d13de72de0387a1301a557477cbed2 | commitdiff |
rebase (autostash): store the full OID in <state-dir>/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 <johannes.schindelin@gmx.de>
Reviewed-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 <johannes.schindelin@gmx.de>
Reviewed-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/rebase.c | diffblobblamehistory |