undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint-1.7.0' into maint

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

Conflicts:
	Documentation/git-fast-import.txt
This commit is contained in:
Junio C Hamano 2011-02-09 16:40:12 -08:00
commit a8e4a5943a
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/git-fast-import.txt
View File

@ -948,6 +948,13 @@ cat-blob::
rather than wasting time on the early part of an import rather than wasting time on the early part of an import
before the unsupported command is detected. before the unsupported command is detected.
notes::
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.
`option` `option`
~~~~~~~~ ~~~~~~~~
Processes the specified option so that git fast-import behaves in a Processes the specified option so that git fast-import behaves in a

2
fast-import.c
View File

@ -2991,6 +2991,8 @@ static int parse_one_feature(const char *feature, int from_stream)
relative_marks_paths = 0; relative_marks_paths = 0;
} else if (!prefixcmp(feature, "force")) { } else if (!prefixcmp(feature, "force")) {
force_update = 1; force_update = 1;
} else if (!strcmp(feature, "notes")) {
; /* do nothing; we have the feature */
} else { } else {
return 0; return 0;
} }

1
t/t9301-fast-import-notes.sh
View File

@ -120,6 +120,7 @@ test_expect_success 'add notes with simple M command' '
test_tick test_tick
cat >input <<INPUT_END cat >input <<INPUT_END
feature notes
commit refs/notes/test commit refs/notes/test
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT data <<COMMIT