Re: [PATCH 2/2] add [--] to usage of filter-branch

[Andreas Heiduk]

Am 09.06.2017 um 15:14 schrieb Junio C Hamano:
> Andreas Heiduk  writes:
> 
>> Am 03.06.2017 um 12:17 schrieb Andreas Heiduk:
>>> Signed-off-by: Andreas Heiduk 
>>> ---
>>>  Documentation/git-filter-branch.txt | 3 ++-
>>>  git-filter-branch.sh| 2 +-
>>>  2 files changed, 3 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/Documentation/git-filter-branch.txt 
>>> b/Documentation/git-filter-branch.txt
>>> index 45c849d8c..1efdda804 100644
>>> --- a/Documentation/git-filter-branch.txt
>>> +++ b/Documentation/git-filter-branch.txt
>>> @@ -86,7 +86,8 @@ OPTIONS
>>> This is not a real filter executed for each commit but a one
>>> time setup just before the loop. Therefore no commit-specific
>>> variables are defined yet.  Functions or variables defined here
>>> -   can be used or modified in the following filter steps.
>>> +   can be used or modified in the following filter steps except
>>> +   the commit filter, for technical reasons.
>>
>> I'll move that into the previous commit.
> 
> Yeah, the description of "technical limitation" is different from
> clarifying the disambiguating "--" in the documentation.
> 
> I am curious what the "technical reason" really is, though ;-)
> 

Well, I just picked up the wording from the "Filter" section a 
couple paragraphs above:

> The filters are applied in the order as listed below.  The 
> argument is always evaluated in the shell context using the 'eval' command
> (with the notable exception of the commit filter, for technical reasons).

Because these reasons exist independently from my change I think I
can get away with just that snappy reference :-]

Re: [PATCH 2/2] add [--] to usage of filter-branch

[Junio C Hamano]

Andreas Heiduk  writes:

> Am 03.06.2017 um 12:17 schrieb Andreas Heiduk:
>> Signed-off-by: Andreas Heiduk 
>> ---
>>  Documentation/git-filter-branch.txt | 3 ++-
>>  git-filter-branch.sh| 2 +-
>>  2 files changed, 3 insertions(+), 2 deletions(-)
>> 
>> diff --git a/Documentation/git-filter-branch.txt 
>> b/Documentation/git-filter-branch.txt
>> index 45c849d8c..1efdda804 100644
>> --- a/Documentation/git-filter-branch.txt
>> +++ b/Documentation/git-filter-branch.txt
>> @@ -86,7 +86,8 @@ OPTIONS
>>  This is not a real filter executed for each commit but a one
>>  time setup just before the loop. Therefore no commit-specific
>>  variables are defined yet.  Functions or variables defined here
>> -can be used or modified in the following filter steps.
>> +can be used or modified in the following filter steps except
>> +the commit filter, for technical reasons.
>
> I'll move that into the previous commit.

Yeah, the description of "technical limitation" is different from
clarifying the disambiguating "--" in the documentation.

I am curious what the "technical reason" really is, though ;-)

Re: [PATCH 2/2] add [--] to usage of filter-branch

[Andreas Heiduk]

Am 03.06.2017 um 12:17 schrieb Andreas Heiduk:
> Signed-off-by: Andreas Heiduk 
> ---
>  Documentation/git-filter-branch.txt | 3 ++-
>  git-filter-branch.sh| 2 +-
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/git-filter-branch.txt 
> b/Documentation/git-filter-branch.txt
> index 45c849d8c..1efdda804 100644
> --- a/Documentation/git-filter-branch.txt
> +++ b/Documentation/git-filter-branch.txt
> @@ -86,7 +86,8 @@ OPTIONS
>   This is not a real filter executed for each commit but a one
>   time setup just before the loop. Therefore no commit-specific
>   variables are defined yet.  Functions or variables defined here
> - can be used or modified in the following filter steps.
> + can be used or modified in the following filter steps except
> + the commit filter, for technical reasons.

I'll move that into the previous commit.

[PATCH 2/2] add [--] to usage of filter-branch

[Andreas Heiduk]

Signed-off-by: Andreas Heiduk 
---
 Documentation/git-filter-branch.txt | 3 ++-
 git-filter-branch.sh| 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-filter-branch.txt 
b/Documentation/git-filter-branch.txt
index 45c849d8c..1efdda804 100644
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@ -86,7 +86,8 @@ OPTIONS
This is not a real filter executed for each commit but a one
time setup just before the loop. Therefore no commit-specific
variables are defined yet.  Functions or variables defined here
-   can be used or modified in the following filter steps.
+   can be used or modified in the following filter steps except
+   the commit filter, for technical reasons.
 
 --env-filter ::
This filter may be used if you only need to modify the environment
diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 2758ae5eb..3a74602ef 100755
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -87,7 +87,7 @@ USAGE="[--setup ] [--env-filter ]
[--commit-filter ] [--tag-name-filter ]
[--subdirectory-filter ] [--original ]
[-d ] [-f | --force]
-   [...]"
+   [--] [...]"
 
 OPTIONS_SPEC=
 . git-sh-setup
-- 
2.13.0