git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Document the --done option.
@ 2012-08-22 10:57 Eric S. Raymond
  2012-08-22 17:38 ` Junio C Hamano
  0 siblings, 1 reply; 5+ messages in thread
From: Eric S. Raymond @ 2012-08-22 10:57 UTC (permalink / raw)
  To: git, gitster

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


-- 
		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] Document the --done option.
  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
  0 siblings, 2 replies; 5+ messages in thread
From: Junio C Hamano @ 2012-08-22 17:38 UTC (permalink / raw)
  To: esr, Sverre Rabbelier; +Cc: git

"Eric S. Raymond" <esr@thyrsus.com> writes:

> ---

A forgotten Sign-off?

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Document the --done option.
  2012-08-22 17:38 ` Junio C Hamano
@ 2012-08-22 17:47   ` Sverre Rabbelier
  2012-08-24 23:19   ` Junio C Hamano
  1 sibling, 0 replies; 5+ messages in thread
From: Sverre Rabbelier @ 2012-08-22 17:47 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: esr, git

On Wed, Aug 22, 2012 at 10:38 AM, Junio C Hamano <gitster@pobox.com> wrote:
> "Eric S. Raymond" <esr@thyrsus.com> writes:
>
>> ---
>
> A forgotten Sign-off?
>
> Sverre, the text matches my understanding as well as what be56862
> (fast-import: introduce 'done' command, 2011-07-16) says it did.
> Ack?

Acked-by: Sverre Rabbelier <srabbelier@gmail.com>

-- 
Cheers,

Sverre Rabbelier

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Document the --done option.
  2012-08-22 17:38 ` Junio C Hamano
  2012-08-22 17:47   ` Sverre Rabbelier
@ 2012-08-24 23:19   ` Junio C Hamano
  2012-09-12  9:11     ` Junio C Hamano
  1 sibling, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2012-08-24 23:19 UTC (permalink / raw)
  To: esr; +Cc: git

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Document the --done option.
  2012-08-24 23:19   ` Junio C Hamano
@ 2012-09-12  9:11     ` Junio C Hamano
  0 siblings, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2012-09-12  9:11 UTC (permalink / raw)
  To: esr; +Cc: git

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

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

Ping again.

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2012-09-12  9:11 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2012-09-12  9:11     ` Junio C Hamano

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