Fix recent 'unpack_trees()'-related changes breaking 'git stash'