[Monotone-devel] Re: [PATCH] git_export: improve mark import when file is empty

[Felipe Contreras]

On Sun, Nov 29, 2009 at 8:40 PM, Felipe Contreras
<address@hidden> wrote:
> If the marks file is empty, git_export will complain about the format.
> Instead, we should ignore the marks, just like git fast-import does.
>
> Signed-off-by: Felipe Contreras <address@hidden>
> ---
>  git_export.cc |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/git_export.cc b/git_export.cc
> index 6b4fcdc..ccee591 100644
> --- a/git_export.cc
> +++ b/git_export.cc
> @@ -89,6 +89,7 @@ import_marks(system_path const & marks_file,
>   data mark_data;
>   read_data(marks_file, mark_data);
>   istringstream marks(mark_data());
> +  marks.peek();
>   while (!marks.eof())
>     {
>       char c;
> --

Anything wrong with this patch? Derek, can you please apply it?

-- 
Felipe Contreras