Merge pull request #2000 from benesch/preserve-dotgit

sdboyer · web-flow · commit affb4f618517 · 2018-09-05T19:52:56.000-04:00
Fix bug in preservation of vendor/.git
diff --git a/txn_writer.go b/txn_writer.go
@@ -668,8 +668,8 @@ func (dw *DeltaWriter) Write(path string, sm gps.SourceManager, examples bool, l
 
 	// Ensure vendor/.git is preserved if present
 	if hasDotGit(vpath) {
-		err = fs.RenameWithFallback(filepath.Join(vpath, ".git"), filepath.Join(vnewpath, "vendor/.git"))
-		if _, ok := err.(*os.LinkError); ok {
+		err = fs.RenameWithFallback(filepath.Join(vpath, ".git"), filepath.Join(vnewpath, ".git"))
+		if err != nil {
 			return errors.Wrap(err, "failed to preserve vendor/.git")
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -668,8 +668,8 @@ func (dw *DeltaWriter) Write(path string, sm gps.SourceManager, examples bool, l`
`668`	`668`
`669`	`669`	`// Ensure vendor/.git is preserved if present`
`670`	`670`	`if hasDotGit(vpath) {`
`671`		`- err = fs.RenameWithFallback(filepath.Join(vpath, ".git"), filepath.Join(vnewpath, "vendor/.git"))`
`672`		`- if _, ok := err.(*os.LinkError); ok {`
	`671`	`+ err = fs.RenameWithFallback(filepath.Join(vpath, ".git"), filepath.Join(vnewpath, ".git"))`
	`672`	`+ if err != nil {`
`673`	`673`	`return errors.Wrap(err, "failed to preserve vendor/.git")`
`674`	`674`	`}`
`675`	`675`	`}`