# [PATCH] git-fast-import(1): remove duplicate "--done" option 5 messages from 2013-01-05 to 2013-01-08. Participants: John Keeping, Eric S. Raymond, Jonathan Nieder. Thread: https://gitlist.dev/t/32534 ## John Keeping, 2013-01-05 16:06 Subject: [PATCH] git-fast-import(1): remove duplicate "--done" option Message-ID: <20130105160652.GE6440@serenity.lan> URL: https://gitlist.dev/e/20130105160652.GE6440%40serenity.lan ``` The "--done" option to git-fast-import is documented twice in its manual page. Combine the best bits of each description, keeping the location of the instance that was added first. Signed-off-by: John Keeping --- I'm guessing that the reason the option was documented again (in commit 3266de10) is because the options are not in an obvious order. There does seem to be some grouping of the options by type, but without subheadings I wonder if it would make more sense to just put them all in alphabetical order? Documentation/git-fast-import.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 68bca1a..4ef5721 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -39,10 +39,6 @@ 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 @@ -108,7 +104,8 @@ OPTIONS output. --done:: - Require a `done` command at the end of the stream. + Terminate with error if there is no 'done' command at the + end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream. -- 1.8.0.2 ``` ## Eric S. Raymond, 2013-01-05 16:26 Subject: Re: [PATCH] git-fast-import(1): remove duplicate "--done" option Message-ID: <20130105162619.GA15757@thyrsus.com> URL: https://gitlist.dev/e/20130105162619.GA15757%40thyrsus.com In-Reply-To: <20130105160652.GE6440@serenity.lan> ``` John Keeping : > I'm guessing that the reason the option was documented again (in commit > 3266de10) is because the options are not in an obvious order. There > does seem to be some grouping of the options by type, but without > subheadings I wonder if it would make more sense to just put them all in > alphabetical order? +1 This duplication originated with me. I'll apologize with a reordering patch. -- Eric S. Raymond ``` ## Jonathan Nieder, 2013-01-05 23:12 Subject: Re: [PATCH] git-fast-import(1): remove duplicate "--done" option Message-ID: <20130105231250.GE3247@elie.Belkin> URL: https://gitlist.dev/e/20130105231250.GE3247%40elie.Belkin In-Reply-To: <20130105160652.GE6440@serenity.lan> ``` John Keeping wrote: > The "--done" option to git-fast-import is documented twice in its manual > page. Combine the best bits of each description, keeping the location > of the instance that was added first. > > Signed-off-by: John Keeping Good catch, thanks. Reviewed-by: Jonathan Nieder ``` ## John Keeping, 2013-01-07 11:57 Subject: [PATCH v2] git-fast-import(1): remove duplicate '--done' option Message-ID: <20130107115709.GJ6440@serenity.lan> URL: https://gitlist.dev/e/20130107115709.GJ6440%40serenity.lan In-Reply-To: <20130105160652.GE6440@serenity.lan> ``` On Sat, Jan 05, 2013 at 04:06:52PM +0000, John Keeping wrote: The '--done' option to git-fast-import is documented twice in its manual page. Combine the best bits of each description, keeping the location of the instance that was added first. Signed-off-by: John Keeping --- Changed since v1: 'done' => `done` I'll wait a bit longer for comments on [1] before I have another go at the full re-organisation of this page. [1] http://article.gmane.org/gmane.comp.version-control.git/212805 Documentation/git-fast-import.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 68bca1a..4ef5721 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -39,10 +39,6 @@ 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 @@ -108,7 +104,8 @@ OPTIONS output. --done:: - Require a `done` command at the end of the stream. + Terminate with error if there is no `done` command at the + end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream. -- 1.8.0.2 ``` ## John Keeping, 2013-01-08 19:39 Subject: [PATCH v3] git-fast-import(1): remove duplicate '--done' option Message-ID: <20130108193934.GP6440@serenity.lan> URL: https://gitlist.dev/e/20130108193934.GP6440%40serenity.lan In-Reply-To: <20130105160652.GE6440@serenity.lan> ``` The '--done' option to git-fast-import is documented twice in its manual page. Combine the best bits of each description, keeping the location of the instance that was added first. Signed-off-by: John Keeping --- The commit description gained some noise in v2; this version should be the really correct, final version. Sorry for the noise. Documentation/git-fast-import.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 68bca1a..4ef5721 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -39,10 +39,6 @@ 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 @@ -108,7 +104,8 @@ OPTIONS output. --done:: - Require a `done` command at the end of the stream. + Terminate with error if there is no `done` command at the + end of the stream. This option might be useful for detecting errors that cause the frontend to terminate before it has started to write a stream. -- 1.8.0.2 ```