Merge pull request #2000 from benesch/preserve-dotgit

Fix bug in preservation of vendor/.git
golang · Sep 5, 2018 · affb4f6 · affb4f6
2 parents 6b79ccc + 880e871
commit affb4f6
Showing 1 changed file with 2 additions and 2 deletions.
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")
 		}
 	}