[web] - fix merge branch compare (#612)

gosh-sh · Oct 19, 2023 · 1e94266 · 1e94266
1 parent 79d9bb5
commit 1e94266
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/react-gosh/src/hooks/repo.hooks.ts b/react-gosh/src/hooks/repo.hooks.ts
@@ -1060,7 +1060,10 @@ function _useMergeRequest(
             MAX_PARALLEL_READ,
             async (treepath, index) => {
                 const { src, dst } = treepath
-                const srcFullPath = `${src.treeitem.commit}/${src.path}`
+                const srcFullPath =
+                    srcRepo.getVersion() < '6.0.0'
+                        ? `${srcBranch.name}/${src.path}`
+                        : `${src.treeitem.commit}/${src.path}`
                 const _srcSnapshot = await srcRepo._getSnapshot({
                     fullpath: srcFullPath,
                 })
@@ -1071,7 +1074,10 @@ function _useMergeRequest(
                 )
                 const srcContent = srcBlob.current
 
-                const dstFullPath = `${dst.treeitem?.commit}/${dst.path}`
+                const dstFullPath =
+                    dstRepo.getVersion() < '6.0.0'
+                        ? `${dstBranch.name}/${dst.path}`
+                        : `${dst.treeitem?.commit}/${dst.path}`
                 let dstContent: string | Buffer = ''
                 if (dst.path) {
                     const _dstSnapshot = await dstRepo._getSnapshot({