Re: [PATCH v2 15/18] fsck: Document the new receive.fsck.* options.

2015-01-19 Thread Johannes Schindelin
Hi Eric,

On 2015-01-19 23:44, Eric Sunshine wrote:
> On Mon, Jan 19, 2015 at 10:51 AM, Johannes Schindelin
>  wrote:
>> Signed-off-by: Johannes Schindelin 
>> ---
>> diff --git a/Documentation/config.txt b/Documentation/config.txt
>> index ae6791d..7371a5f 100644
>> --- a/Documentation/config.txt
>> +++ b/Documentation/config.txt
>> @@ -2130,6 +2130,31 @@ receive.fsckObjects::
>> Defaults to false. If not set, the value of `transfer.fsckObjects`
>> is used instead.
>>
>> +receive.fsck.*::
>> +   When `receive.fsckObjects` is set to true, errors can be switched
>> +   to warnings and vice versa by configuring the `receive.fsck.*`
>> +   settings. These settings contain comma-separated lists of fsck
>> +   message IDs. For convenience, fsck prefixes the error/warning with
>> +   the message ID, e.g. "missing-email: invalid author/committer line
>> +   - missing email" means that setting `receive.fsck.ignore =
>> +   missing-email` will hide that issue.
>> ++
>> +--
>> +   error::
>> +   a comma-separated list of fsck message IDs that should be
>> +   trigger fsck to error out.
>> +   warn::
>> +   a comma-separated list of fsck message IDs that should be
>> +   displayed, but fsck should continue to error out.
>> +   ignore::
>> +   a comma-separated list of fsck message IDs that should be
>> +   ignored completely.
>> ++
>> +This feature is intended to support working with legacy repositories
>> +which would not pass pushing when `receive.fsckObjects = true`, allowing
>> +the host to accept repositories certain known issues but still catch
> 
> s/certain/with &/

Good catch. Fixed here (to be included in the next re-roll):

https://github.com/dscho/git/commit/2517476646835e61c33581935fc68062a8ff3f56#diff-ba92ef40c548c691816362bbdc35a613R2155

Thanks!
Dscho
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH v2 15/18] fsck: Document the new receive.fsck.* options.

2015-01-19 Thread Eric Sunshine
On Mon, Jan 19, 2015 at 10:51 AM, Johannes Schindelin
 wrote:
> Signed-off-by: Johannes Schindelin 
> ---
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index ae6791d..7371a5f 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -2130,6 +2130,31 @@ receive.fsckObjects::
> Defaults to false. If not set, the value of `transfer.fsckObjects`
> is used instead.
>
> +receive.fsck.*::
> +   When `receive.fsckObjects` is set to true, errors can be switched
> +   to warnings and vice versa by configuring the `receive.fsck.*`
> +   settings. These settings contain comma-separated lists of fsck
> +   message IDs. For convenience, fsck prefixes the error/warning with
> +   the message ID, e.g. "missing-email: invalid author/committer line
> +   - missing email" means that setting `receive.fsck.ignore =
> +   missing-email` will hide that issue.
> ++
> +--
> +   error::
> +   a comma-separated list of fsck message IDs that should be
> +   trigger fsck to error out.
> +   warn::
> +   a comma-separated list of fsck message IDs that should be
> +   displayed, but fsck should continue to error out.
> +   ignore::
> +   a comma-separated list of fsck message IDs that should be
> +   ignored completely.
> ++
> +This feature is intended to support working with legacy repositories
> +which would not pass pushing when `receive.fsckObjects = true`, allowing
> +the host to accept repositories certain known issues but still catch

s/certain/with &/

> +other issues.
> +
>  receive.unpackLimit::
> If the number of objects received in a push is below this
> limit then the objects will be unpacked into loose object
> --
> 2.0.0.rc3.9669.g840d1f9
>
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH v2 15/18] fsck: Document the new receive.fsck.* options.

2015-01-19 Thread Johannes Schindelin
Signed-off-by: Johannes Schindelin 
---
 Documentation/config.txt | 25 +
 1 file changed, 25 insertions(+)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index ae6791d..7371a5f 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2130,6 +2130,31 @@ receive.fsckObjects::
Defaults to false. If not set, the value of `transfer.fsckObjects`
is used instead.
 
+receive.fsck.*::
+   When `receive.fsckObjects` is set to true, errors can be switched
+   to warnings and vice versa by configuring the `receive.fsck.*`
+   settings. These settings contain comma-separated lists of fsck
+   message IDs. For convenience, fsck prefixes the error/warning with
+   the message ID, e.g. "missing-email: invalid author/committer line
+   - missing email" means that setting `receive.fsck.ignore =
+   missing-email` will hide that issue.
++
+--
+   error::
+   a comma-separated list of fsck message IDs that should be
+   trigger fsck to error out.
+   warn::
+   a comma-separated list of fsck message IDs that should be
+   displayed, but fsck should continue to error out.
+   ignore::
+   a comma-separated list of fsck message IDs that should be
+   ignored completely.
++
+This feature is intended to support working with legacy repositories
+which would not pass pushing when `receive.fsckObjects = true`, allowing
+the host to accept repositories certain known issues but still catch
+other issues.
+
 receive.unpackLimit::
If the number of objects received in a push is below this
limit then the objects will be unpacked into loose object
-- 
2.0.0.rc3.9669.g840d1f9



--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html