Merge pull request #18887 from desktop/args-args-everywhere

Inline argument conditionals

app/src/lib/git/checkout.ts

@@ -20,28 +20,22 @@ import { IRemote } from '../../models/remote'
 export type ProgressCallback = (progress: ICheckoutProgress) => void
 
 function getCheckoutArgs(progressCallback?: ProgressCallback) {
-  return progressCallback != null
-    ? [...gitNetworkArguments(), 'checkout', '--progress']
-    : [...gitNetworkArguments(), 'checkout']
+  return [
+    ...gitNetworkArguments(),
+    'checkout',
+    ...(progressCallback ? ['--progress'] : []),
+  ]
 }
 
 async function getBranchCheckoutArgs(branch: Branch) {
-  const baseArgs: ReadonlyArray<string> = []
-  if (enableRecurseSubmodulesFlag()) {
-    return branch.type === BranchType.Remote
-      ? baseArgs.concat(
-          branch.name,
-          '-b',
-          branch.nameWithoutRemote,
-          '--recurse-submodules',
-          '--'
-        )
-      : baseArgs.concat(branch.name, '--recurse-submodules', '--')
-  }
-
-  return branch.type === BranchType.Remote
-    ? baseArgs.concat(branch.name, '-b', branch.nameWithoutRemote, '--')
-    : baseArgs.concat(branch.name, '--')
+  return [
+    branch.name,
+    ...(branch.type === BranchType.Remote
+      ? ['-b', branch.nameWithoutRemote]
+      : []),
+    ...(enableRecurseSubmodulesFlag() ? ['--recurse-submodules'] : []),
+    '--',
+  ]
 }
 
 async function getCheckoutOpts(

app/src/lib/git/core.ts

@@ -485,8 +485,7 @@ export function gitRebaseArguments() {
     // uses the merge backend even if the user has the apply backend
     // configured, since this is the only one supported.
     // This can go away once git deprecates the apply backend.
-    '-c',
-    'rebase.backend=merge',
+    ...['-c', 'rebase.backend=merge'],
   ]
 }
 

app/src/lib/git/fetch.ts

@@ -11,28 +11,16 @@ async function getFetchArgs(
   remote: string,
   progressCallback?: (progress: IFetchProgress) => void
 ) {
-  if (enableRecurseSubmodulesFlag()) {
-    return progressCallback != null
-      ? [
-          ...gitNetworkArguments(),
-          'fetch',
-          '--progress',
-          '--prune',
-          '--recurse-submodules=on-demand',
-          remote,
-        ]
-      : [
-          ...gitNetworkArguments(),
-          'fetch',
-          '--prune',
-          '--recurse-submodules=on-demand',
-          remote,
-        ]
-  } else {
-    return progressCallback != null
-      ? [...gitNetworkArguments(), 'fetch', '--progress', '--prune', remote]
-      : [...gitNetworkArguments(), 'fetch', '--prune', remote]
-  }
+  return [
+    ...gitNetworkArguments(),
+    'fetch',
+    ...(progressCallback ? ['--progress'] : []),
+    '--prune',
+    ...(enableRecurseSubmodulesFlag()
+      ? ['--recurse-submodules=on-demand']
+      : []),
+    remote,
+  ]
 }
 
 /**

app/src/lib/git/pull.ts

@@ -19,28 +19,15 @@ async function getPullArgs(
   remote: string,
   progressCallback?: (progress: IPullProgress) => void
 ) {
-  const divergentPathArgs = await getDefaultPullDivergentBranchArguments(
-    repository
-  )
-
-  const args = [
+  return [
     ...gitNetworkArguments(),
     ...gitRebaseArguments(),
     'pull',
-    ...divergentPathArgs,
+    ...(await getDefaultPullDivergentBranchArguments(repository)),
+    ...(enableRecurseSubmodulesFlag() ? ['--recurse-submodules'] : []),
+    ...(progressCallback ? ['--progress'] : []),
+    remote,
   ]
-
-  if (enableRecurseSubmodulesFlag()) {
-    args.push('--recurse-submodules')
-  }
-
-  if (progressCallback != null) {
-    args.push('--progress')
-  }
-
-  args.push(remote)
-
-  return args
 }
 
 /**