Skip to content

Commit b006126

Browse files
Top-Gwentandi_wang
andauthored
clarify file error (#296)
Co-authored-by: tandi_wang <[email protected]>
1 parent 7d8c6c0 commit b006126

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

merge.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,10 @@ func loadMergeFiles(dirPath string) error {
289289
mergeDirPath := mergeDirPath(dirPath)
290290
if _, err := os.Stat(mergeDirPath); err != nil {
291291
// does not exist, just return.
292-
return nil
292+
if os.IsNotExist(err) {
293+
return nil
294+
}
295+
return err
293296
}
294297

295298
// remove the merge directory at last

0 commit comments

Comments
 (0)