Make sure .git/info is created before generating .git/info/sparse-che… (#5825)

typeless · lafriks · commit ec31ee1c1cd0 · 2019-01-24T09:43:37.000+02:00
* Make sure .git/info is created before generating .git/info/sparse-checkout

* fix permissions
diff --git a/models/pull.go b/models/pull.go
@@ -447,7 +447,11 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle
 		return fmt.Errorf("getDiffTree: %v", err)
 	}
 
-	sparseCheckoutListPath := filepath.Join(tmpBasePath, ".git", "info", "sparse-checkout")
+	infoPath := filepath.Join(tmpBasePath, ".git", "info")
+	if err := os.MkdirAll(infoPath, 0700); err != nil {
+		return fmt.Errorf("creating directory failed [%s]: %v", infoPath, err)
+	}
+	sparseCheckoutListPath := filepath.Join(infoPath, "sparse-checkout")
 	if err := ioutil.WriteFile(sparseCheckoutListPath, []byte(sparseCheckoutList), 0600); err != nil {
 		return fmt.Errorf("Writing sparse-checkout file to %s: %v", sparseCheckoutListPath, err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,11 @@ func (pr PullRequest) Merge(doer User, baseGitRepo *git.Repository, mergeStyle`
`447`	`447`	`return fmt.Errorf("getDiffTree: %v", err)`
`448`	`448`	`}`
`449`	`449`
`450`		`- sparseCheckoutListPath := filepath.Join(tmpBasePath, ".git", "info", "sparse-checkout")`
	`450`	`+ infoPath := filepath.Join(tmpBasePath, ".git", "info")`
	`451`	`+ if err := os.MkdirAll(infoPath, 0700); err != nil {`
	`452`	`+ return fmt.Errorf("creating directory failed [%s]: %v", infoPath, err)`
	`453`	`+ }`
	`454`	`+ sparseCheckoutListPath := filepath.Join(infoPath, "sparse-checkout")`
`451`	`455`	`if err := ioutil.WriteFile(sparseCheckoutListPath, []byte(sparseCheckoutList), 0600); err != nil {`
`452`	`456`	`return fmt.Errorf("Writing sparse-checkout file to %s: %v", sparseCheckoutListPath, err)`
`453`	`457`	`}`