From 2cc9698b581838c88ccc6ca36fe3bbd1c458ec4d Mon Sep 17 00:00:00 2001
From: Marco Vanotti <mvanotti@google.com>
Date: Wed, 20 Mar 2019 10:49:11 -0700
Subject: pkg/vcs: fix fuchsia's git repo directory.

This commit changes the fuchsia git repo to make it point to the main
repo instead of just "zircon".

Previously, zircon had its own git repo, so syzkaller had a wrapper that
would issue jiri commands for the whole fuchsia repo, but would just
report commits in the zircon repo.

Recently, fuchsia merged most of its repositories in just one big git
repo. So now, zircon is part of the fuchsia git repo. I think the code
continued working because the old zircon repo is still part of a git
repository, so git commands worked there.

The new code now doesn't have any special casing for Zircon, and now
(almost) everything is part of the fuchsia repo. The other repos are now
git submodules.
---
 pkg/vcs/fuchsia.go | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'pkg')

diff --git a/pkg/vcs/fuchsia.go b/pkg/vcs/fuchsia.go
index 7d7072e94..e00b31098 100644
--- a/pkg/vcs/fuchsia.go
+++ b/pkg/vcs/fuchsia.go
@@ -12,16 +12,16 @@ import (
 )
 
 type fuchsia struct {
-	vm     string
-	dir    string
-	zircon *git
+	vm   string
+	dir  string
+	repo *git
 }
 
 func newFuchsia(vm, dir string) *fuchsia {
 	return &fuchsia{
-		vm:     vm,
-		dir:    dir,
-		zircon: newGit(filepath.Join(dir, "zircon"), nil),
+		vm:   vm,
+		dir:  dir,
+		repo: newGit(dir, nil),
 	}
 }
 
@@ -35,7 +35,7 @@ func (ctx *fuchsia) Poll(repo, branch string) (*Commit, error) {
 			return nil, err
 		}
 	}
-	return ctx.zircon.HeadCommit()
+	return ctx.repo.HeadCommit()
 }
 
 func (ctx *fuchsia) initRepo() error {
@@ -75,17 +75,17 @@ func (ctx *fuchsia) HeadCommit() (*Commit, error) {
 }
 
 func (ctx *fuchsia) GetCommitByTitle(title string) (*Commit, error) {
-	return ctx.zircon.GetCommitByTitle(title)
+	return ctx.repo.GetCommitByTitle(title)
 }
 
 func (ctx *fuchsia) GetCommitsByTitles(titles []string) ([]*Commit, []string, error) {
-	return ctx.zircon.GetCommitsByTitles(titles)
+	return ctx.repo.GetCommitsByTitles(titles)
 }
 
 func (ctx *fuchsia) ListRecentCommits(baseCommit string) ([]string, error) {
-	return ctx.zircon.ListRecentCommits(baseCommit)
+	return ctx.repo.ListRecentCommits(baseCommit)
 }
 
 func (ctx *fuchsia) ExtractFixTagsFromCommits(baseCommit, email string) ([]*Commit, error) {
-	return ctx.zircon.ExtractFixTagsFromCommits(baseCommit, email)
+	return ctx.repo.ExtractFixTagsFromCommits(baseCommit, email)
 }
-- 
cgit mrf-deployment