Always include file location in hash

pkg/ddevapp/mutagen.go

@@ -135,7 +135,9 @@ func GetMutagenConfigFilePath(app *DdevApp) string {
 // GetMutagenConfigFileHash returns the SHA1 hash of the mutagen.yml
 func GetMutagenConfigFileHash(app *DdevApp) (string, error) {
 	f := GetMutagenConfigFilePath(app)
-	hash, err := fileutil.FileHash(f)
+	// Create hash based on mutagen.yml file contents, location,
+	//and global config
+	hash, err := fileutil.FileHash(f, globalconfig.GetGlobalDdevDirLocation())
 	if err != nil {
 		return "", err
 	}

pkg/fileutil/file_hash.go

@@ -9,7 +9,8 @@ import (
 )
 
 // FileHash returns string of hash of filePath passed in
-func FileHash(filePath string) (string, error) {
+// And optional string can be added to content that will be hashed
+func FileHash(filePath string, optionalExtraString string) (string, error) {
 	file, err := os.Open(filePath)
 	if err != nil {
 		return "", err
@@ -25,6 +26,19 @@ func FileHash(filePath string) (string, error) {
 	if _, err := io.Copy(hash, file); err != nil {
 		return "", err
 	}
+	// Include file location in the hash, if in a different
+	// place it should not hash the same
+	if _, err := hash.Write([]byte(file.Name())); err != nil {
+		return "", err
+	}
+
+	// Add optional string to hash if provided
+	if len(optionalExtraString) > 0 {
+		if _, err := hash.Write([]byte(optionalExtraString)); err != nil {
+			return "", err
+		}
+	}
+
 	sum := hash.Sum(nil)
 
 	return fmt.Sprintf("%x", sum), nil

pkg/fileutil/file_hash_test.go

@@ -39,7 +39,7 @@ func TestFileHash(t *testing.T) {
 			expectedHash, err := externalComputeSha1Sum(testFile)
 			require.NoError(t, err)
 
-			result, err := fileutil.FileHash(testFile)
+			result, err := fileutil.FileHash(testFile, "")
 			require.NoError(t, err)
 
 			require.Equal(t, expectedHash, result)