Junio C Hamano  committed a8e4a59 Merge with conflicts

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


  • Participants
  • Parent commits 59ab4eb, 547e8b9

Comments (0)

Files changed (3)

File Documentation/git-fast-import.txt

 	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

File fast-import.c

 		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;

File t/

 cat >input <<INPUT_END
+feature notes
 commit refs/notes/test
 data <<COMMIT