summaryrefslogtreecommitdiff
path: root/fast-import.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-02-09 16:40:12 -0800
committerJunio C Hamano <gitster@pobox.com>2011-02-09 16:40:12 -0800
commita8e4a5943a63c8fd4a3a9b70ccf4608bcc973707 (patch)
tree8a4b75f257082a2361eb75d963a7bc8546bbfc07 /fast-import.c
parent59ab4eb36e20b0df9231e736f7d685fb43ad9364 (diff)
parent547e8b9205349b47003ed25a82673e413e71c255 (diff)
downloadgit-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
Diffstat (limited to 'fast-import.c')
-rw-r--r--fast-import.c2
1 files changed, 2 insertions, 0 deletions
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;
}