Perhaps I'm missing something (it's been a long day), but couldn't "--" be used for both?

    git cmd --options -- rev -- pathspec

    git cmd --option -- rev --

    git cmd --option revspec -- pathspec

Currently, git log -- a -- prints all commits that affects the files whose name is a or two dashes.