Re: [PATCH] Document the --done option.

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 24, 2012, 23:19 UTC
Message-ID: <7voblzyj2q.fsf@alter.siamese.dyndns.org>
In-Reply-To: <7vobm2968x.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

Show 5 quoted lines

> "Eric S. Raymond" <esr@thyrsus.com> writes:
>
>> ---
>
> A forgotten Sign-off?

Ping?  Just telling us that this is Signed-off is fine.

Thanks.

Show 36 quoted lines

>
> Sverre, the text matches my understanding as well as what be56862
> (fast-import: introduce 'done' command, 2011-07-16) says it did.
> Ack?
>
>>  Documentation/git-fast-import.txt |    8 +++++++-
>>  1 file changed, 7 insertions(+), 1 deletion(-)
>>
>> diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
>> index 2620d28..9291ea0 100644
>> --- a/Documentation/git-fast-import.txt
>> +++ b/Documentation/git-fast-import.txt
>> @@ -39,6 +39,10 @@ OPTIONS
>>  	See ``Date Formats'' below for details about which formats
>>  	are supported, and their syntax.
>>  
>> +-- done::
>> +	Terminate with error if there is no 'done' command at the 
>> +	end of the stream.
>> +
>>  --force::
>>  	Force updating modified existing branches, even if doing
>>  	so would cause commits to be lost (as the new commit does
>> @@ -1047,7 +1051,9 @@ done::
>>  	Error out if the stream ends without a 'done' command.
>>  	Without this feature, errors causing the frontend to end
>>  	abruptly at a convenient point in the stream can go
>> -	undetected.
>> +	undetected.  This may occur, for example, if an import
>> +	front end dies in mid-operation without emitting SIGTERM
>> +	or SIGKILL at its subordinate git fast-import instance.
>>  
>>  `option`
>>  ~~~~~~~~
>> -- 
>> 1.7.9.5