diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-02-16 14:32:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-16 14:32:47 -0800 |
| commit | 206af7c96b134b4962fa04fa174a25f29efd7e5e (patch) | |
| tree | 3e424daab965672034b6018067654dc697ed7d23 /fast-import.c | |
| parent | 567323d387dda559dbdba8c15453aba629393955 (diff) | |
| parent | 547e8b9205349b47003ed25a82673e413e71c255 (diff) | |
| download | git-206af7c96b134b4962fa04fa174a25f29efd7e5e.tar.gz | |
Merge branch 'maint-1.7.0' into maint-1.7.1
* maint-1.7.0:
fast-import: introduce "feature notes" command
fast-import: clarify documentation of "feature" command
Diffstat (limited to 'fast-import.c')
| -rw-r--r-- | fast-import.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fast-import.c b/fast-import.c index 309f2c58a2..bce460e2ed 100644 --- a/fast-import.c +++ b/fast-import.c @@ -2798,6 +2798,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; } |