threads / patch / 31313

patchDocument the --done option.

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

## tl;dr

5 messages between Aug 22, 2012 and Sep 12, 2012. Diffs are folded; open one to read it.

replies: 4people: 3as markdown or json

Eric S. Raymond· Aug 22, 2012, 10:57 UTC · lore
---
 Documentation/git-fast-import.txt |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
Show changes to Documentation/git-fast-import.txt +7 −1
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>
Junio C Hamano· Aug 22, 2012, 17:38 UTC · re: Eric S. Raymond · lore

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

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

Show 31 quoted lines
>  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
Sverre Rabbelier· Aug 22, 2012, 17:47 UTC · re: Junio C Hamano · lore

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

On Wed, Aug 22, 2012 at 10:38 AM, Junio C Hamano <gitster@pobox.com> wrote:
Show 9 quoted lines
> "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
Junio C Hamano· Aug 24, 2012, 23:19 UTC · re: Junio C Hamano · lore

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

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
Junio C Hamano· Sep 12, 2012, 09:11 UTC · re: Junio C Hamano · lore

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

Junio C Hamano <gitster@pobox.com> writes:
Show 9 quoted lines
> 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.

← back to recent threads