Merge branch 'maint-1.7.2' into maint-1.7.3

diff --git a/fast-import.c b/fast-import.c
index 7563e43a39c4d4573218fab52ffbf64a255f2562..8be8a5b73298e2f4a3c7e68a1c824fb0b6cd92e8 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -2815,6 +2815,8 @@ static int parse_one_feature(const char *feature, int from_stream)
                relative_marks_paths = 0;
        } else if (!prefixcmp(feature, "force")) {
                force_update = 1;
+       } else if (!strcmp(feature, "notes")) {
+               ; /* do nothing; we have the feature */
        } else {
                return 0;
        }