Refactor AddArgs calls to include url parameter

Author: unknwon

repo_remote.go

@@ -49,8 +49,7 @@ func LsRemote(url string, opts ...LsRemoteOptions) ([]*Reference, error) {
 	if opt.Refs {
 		cmd.AddArgs("--refs")
 	}
-	cmd.AddArgs("--end-of-options")
-	cmd.AddArgs(url)
+	cmd.AddArgs("--end-of-options", url)
 	if len(opt.Patterns) > 0 {
 		cmd.AddArgs(opt.Patterns...)
 	}
@@ -121,9 +120,8 @@ func RemoteAdd(repoPath, name, url string, opts ...RemoteAddOptions) error {
 	if opt.MirrorFetch {
 		cmd.AddArgs("--mirror=fetch")
 	}
-	cmd.AddArgs("--end-of-options")
 
-	_, err := cmd.AddArgs(name, url).RunInDirWithTimeout(opt.Timeout, repoPath)
+	_, err := cmd.AddArgs("--end-of-options", name, url).RunInDirWithTimeout(opt.Timeout, repoPath)
 	return err
 }
 
@@ -264,9 +262,8 @@ func RemoteGetURL(repoPath, name string, opts ...RemoteGetURLOptions) ([]string,
 	if opt.All {
 		cmd.AddArgs("--all")
 	}
-	cmd.AddArgs("--end-of-options")
 
-	stdout, err := cmd.AddArgs(name).RunInDirWithTimeout(opt.Timeout, repoPath)
+	stdout, err := cmd.AddArgs("--end-of-options", name).RunInDirWithTimeout(opt.Timeout, repoPath)
 	if err != nil {
 		return nil, err
 	}
@@ -309,8 +306,7 @@ func RemoteSetURL(repoPath, name, newurl string, opts ...RemoteSetURLOptions) er
 		cmd.AddArgs("--push")
 	}
 
-	cmd.AddArgs("--end-of-options")
-	cmd.AddArgs(name, newurl)
+	cmd.AddArgs("--end-of-options", name, newurl)
 
 	if opt.Regex != "" {
 		cmd.AddArgs(opt.Regex)
@@ -365,8 +361,7 @@ func RemoteSetURLAdd(repoPath, name, newurl string, opts ...RemoteSetURLAddOptio
 		cmd.AddArgs("--push")
 	}
 
-	cmd.AddArgs("--end-of-options")
-	cmd.AddArgs(name, newurl)
+	cmd.AddArgs("--end-of-options", name, newurl)
 
 	_, err := cmd.RunInDirWithTimeout(opt.Timeout, repoPath)
 	if err != nil && strings.Contains(err.Error(), "Will not delete all non-push URLs") {
@@ -412,8 +407,7 @@ func RemoteSetURLDelete(repoPath, name, regex string, opts ...RemoteSetURLDelete
 		cmd.AddArgs("--push")
 	}
 
-	cmd.AddArgs("--end-of-options")
-	cmd.AddArgs(name, regex)
+	cmd.AddArgs("--end-of-options", name, regex)
 
 	_, err := cmd.RunInDirWithTimeout(opt.Timeout, repoPath)
 	if err != nil && strings.Contains(err.Error(), "Will not delete all non-push URLs") {