Skip to content

Commit 6fdab1a

Browse files
committed
Fix merge panic
1 parent 03fce8f commit 6fdab1a

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

services/pull/merge_prepare.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,11 @@ func createTemporaryRepoForMerge(ctx context.Context, pr *issues_model.PullReque
7373
}
7474

7575
if expectedHeadCommitID != "" {
76-
trackingCommitID, _, err := mergeCtx.PrepareGitCmd(gitcmd.NewCommand("show-ref", "--hash").AddDynamicArguments(git.BranchPrefix + trackingBranch)).RunStdString(ctx)
76+
trackingCommitID, _, err := gitcmd.NewCommand("show-ref", "--hash").
77+
AddDynamicArguments(git.BranchPrefix + trackingBranch).
78+
WithEnv(mergeCtx.env).
79+
WithDir(mergeCtx.tmpBasePath).
80+
RunStdString(ctx)
7781
if err != nil {
7882
defer cancel()
7983
log.Error("failed to get sha of head branch in %-v: show-ref[%s] --hash refs/heads/tracking: %v", mergeCtx.pr, mergeCtx.tmpBasePath, err)

0 commit comments

Comments
 (0)