diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-02-09 16:40:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-09 16:40:12 -0800 |
| commit | a8e4a5943a63c8fd4a3a9b70ccf4608bcc973707 (patch) | |
| tree | 8a4b75f257082a2361eb75d963a7bc8546bbfc07 | |
| parent | 59ab4eb36e20b0df9231e736f7d685fb43ad9364 (diff) | |
| parent | 547e8b9205349b47003ed25a82673e413e71c255 (diff) | |
| download | git-a8e4a5943a63c8fd4a3a9b70ccf4608bcc973707.tar.gz | |
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
Conflicts:
Documentation/git-fast-import.txt
| -rw-r--r-- | Documentation/git-fast-import.txt | 7 | ||||
| -rw-r--r-- | fast-import.c | 2 | ||||
| -rwxr-xr-x | t/t9301-fast-import-notes.sh | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 4415e63635..02bb49886c 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -948,6 +948,13 @@ cat-blob:: rather than wasting time on the early part of an import 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` ~~~~~~~~ Processes the specified option so that git fast-import behaves in a diff --git a/fast-import.c b/fast-import.c index 60f26fe473..970d8470ed 100644 --- a/fast-import.c +++ b/fast-import.c @@ -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; } diff --git a/t/t9301-fast-import-notes.sh b/t/t9301-fast-import-notes.sh index 7cf8cd8a2f..463254c727 100755 --- a/t/t9301-fast-import-notes.sh +++ b/t/t9301-fast-import-notes.sh @@ -120,6 +120,7 @@ test_expect_success 'add notes with simple M command' ' test_tick cat >input <<INPUT_END +feature notes commit refs/notes/test committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE data <<COMMIT |