Skip to content

Commit 02a0c26

Browse files
committed
drop --filter as not available in 2.7
1 parent ed58d7a commit 02a0c26

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

modules/merge/merge.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ func Merge(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repositor
355355
defer wg.Done()
356356
defer revListWriter.Close()
357357
stderr := new(bytes.Buffer)
358-
cmd := git.NewCommand("rev-list", "--objects", "--filter=blob:limit=1k", "HEAD", "--not", "origin/"+pr.BaseBranch)
358+
cmd := git.NewCommand("rev-list", "--objects", "HEAD", "--not", "origin/"+pr.BaseBranch)
359359
if err := cmd.RunInDirPipeline(tmpBasePath, revListWriter, stderr); err != nil {
360360
log.Error("git rev-list [%s]: %v - %s", tmpBasePath, err, errbuf.String())
361361
errChan <- fmt.Errorf("git rev-list [%s]: %v - %s", tmpBasePath, err, errbuf.String())

0 commit comments

Comments
 (0)