summaryrefslogtreecommitdiff
path: root/t/t9814-git-p4-rename.sh
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2018-10-22 15:15:03 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-10-23 13:17:08 +0900
commit12aeb00a22e589f85e26da833e05bb1a7e412d07 (patch)
tree328214da4651d140957cca8673c432a3088569dd /t/t9814-git-p4-rename.sh
parentrebase (autostash): avoid duplicate call to state_dir_path() (diff)
downloadtgif-12aeb00a22e589f85e26da833e05bb1a7e412d07.tar.xz
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>
Diffstat (limited to 't/t9814-git-p4-rename.sh')
0 files changed, 0 insertions, 0 deletions