git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: esr@thyrsus.com
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Document the --done option.
Date: Fri, 24 Aug 2012 16:19:09 -0700	[thread overview]
Message-ID: <7voblzyj2q.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <7vobm2968x.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Wed, 22 Aug 2012 10:38:38 -0700")

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

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

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

Thanks.

>
> 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

  parent reply	other threads:[~2012-08-24 23:19 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-22 10:57 [PATCH] Document the --done option Eric S. Raymond
2012-08-22 17:38 ` Junio C Hamano
2012-08-22 17:47   ` Sverre Rabbelier
2012-08-24 23:19   ` Junio C Hamano [this message]
2012-09-12  9:11     ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7voblzyj2q.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=esr@thyrsus.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).