Commit a8e4a594 authored by Junio C Hamano's avatar Junio C Hamano

Merge branch 'maint-1.7.0' into maint

* maint-1.7.0:
  fast-import: introduce "feature notes" command
  fast-import: clarify documentation of "feature" command

parents 59ab4eb3 547e8b92
......@@ -948,6 +948,13 @@ cat-blob::
rather than wasting time on the early part of an import
before the unsupported command is detected.
Require that the backend support the 'notemodify' (N)
subcommand to the 'commit' command.
Versions of fast-import not supporting notes will exit
with a message indicating so.
Processes the specified option so that git fast-import behaves in a
......@@ -2991,6 +2991,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;
......@@ -120,6 +120,7 @@ test_expect_success 'add notes with simple M command' '
cat >input <<INPUT_END
feature notes
commit refs/notes/test
data <<COMMIT
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment