I never have this exact problem.

It's rare that my stale prompt has a "git" in it.

Most of my git commands have mnemonic aliases like "gs", "gd", "gl".

I usually have the problem where a stale "ls" or "vim" inhabits the prompt.