|
|
|
@ -1,6 +1,6 @@ |
|
|
|
|
import { ReadBlobResult, ReadCommitResult } from "isomorphic-git"; |
|
|
|
|
import React from "react"; |
|
|
|
|
import { fileStatus, fileStatusMerge, setRemoteBranchCommits, resetRemoteBranchCommits, setBranches, setCanCommit, setCommitChanges, setCommits, setCurrentBranch, setGitHubUser, setLoading, setRemoteBranches, setRemotes, setRepos, setUpstream, setLocalBranchCommits, setBranchDifferences, setRemoteAsDefault, setScopes, setLog, clearLog, setUserEmails, setCurrenHead, setStoragePayload } from "../state/gitpayload"; |
|
|
|
|
import { fileStatus, fileStatusMerge, setRemoteBranchCommits, resetRemoteBranchCommits, setBranches, setCanCommit, setCommitChanges, setCommits, setCurrentBranch, setGitHubUser, setLoading, setRemoteBranches, setRemotes, setRepos, setUpstream, setLocalBranchCommits, setBranchDifferences, setRemoteAsDefault, setScopes, setLog, clearLog, setUserEmails, setCurrenHead, setStoragePayload, resetBranchDifferences } from "../state/gitpayload"; |
|
|
|
|
import { GitHubUser, branch, commitChange, gitActionDispatch, statusMatrixType, gitState, branchDifference, remote, gitLog, fileStatusResult, customGitApi, IGitApi, cloneInputType, fetchInputType, pullInputType, pushInputType, checkoutInput, rmInput, addInput, repository, userEmails, storage } from '../types'; |
|
|
|
|
import { removeSlash } from "../utils"; |
|
|
|
|
import { disableCallBacks, enableCallBacks } from "./listeners"; |
|
|
|
@ -784,7 +784,10 @@ export const getBranchDifferences = async (branch: branch, remote: remote, state |
|
|
|
|
remote = state.remotes[0] |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if (!remote) return |
|
|
|
|
if (!remote) { |
|
|
|
|
dispatch(resetBranchDifferences()) |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
try { |
|
|
|
|
|
|
|
|
|
const branchDifference: branchDifference = await plugin.call('dgitApi', 'compareBranches', { |
|
|
|
|