fixed an argument counting bug

(cherry picked from commit 458f2734)
7 jobs for git-replay-merge-no-push-option-v9_12-v9_11 in 7 minutes and 11 seconds (queued for 6 seconds)