~vcs-imports/vendor/master

« back to all changes in this revision

Viewing changes to context/modify.go

  • Committer: Daniel Theophanes
  • Author(s): Mikhail Grachev
  • Date: 2018-11-14 22:15:43 UTC
  • Revision ID: git-v1:f544984a1212187b38359ec7e21245718c4dbde2
Omit explicit bool check

Show diffs side-by-side

added added

removed removed

Lines of Context:
470
470
                return nil
471
471
        }
472
472
        // Protect non-project paths from being removed.
473
 
        if pathos.FileHasPrefix(pkg.Dir, ctx.RootDir) == false {
 
473
        if !pathos.FileHasPrefix(pkg.Dir, ctx.RootDir) {
474
474
                return nil
475
475
        }
476
476
        if pkg.Status.Location == LocationLocal {
569
569
// Operation listed in the OpIndex field.
570
570
func (ctx *Context) ResloveApply(cc []*Conflict) {
571
571
        for _, c := range cc {
572
 
                if c.Resolved == false {
 
572
                if !c.Resolved {
573
573
                        continue
574
574
                }
575
575
                for i, op := range c.Operation {