diff --git a/git/command/builder.go b/git/command/builder.go
index 3fbd3ebf3..0f4291485 100644
--- a/git/command/builder.go
+++ b/git/command/builder.go
@@ -275,7 +275,7 @@ func (b builder) args(flags []string, args []string, postSepArgs []string) ([]st
 	}
 	cmdArgs = append(cmdArgs, args...)
 
-	if len(postSepArgs) > 0 {
+	if len(postSepArgs) > 0 && len(cmdArgs) > 0 && cmdArgs[len(cmdArgs)-1] != "--end-of-options" {
 		cmdArgs = append(cmdArgs, "--")
 	}