[c12814] Fix git_id was broken with -s option