Re: [PATCH v2 12/12] rev-list: expose and document --single-worktree

2017-04-19 Thread Junio C Hamano
Duy Nguyen  writes:

> On Sun, Mar 19, 2017 at 1:00 AM, Junio C Hamano  wrote:
>>> diff --git a/Documentation/rev-list-options.txt 
>>> b/Documentation/rev-list-options.txt
>>> index a02f7324c0..c71e94b2d0 100644
>>> --- a/Documentation/rev-list-options.txt
>>> +++ b/Documentation/rev-list-options.txt
>>> @@ -179,6 +179,14 @@ explicitly.
>>>   Pretend as if all objects mentioned by reflogs are listed on the
>>>   command line as ``.
>>>
>>> +--single-worktree::
>>> + By default, all working trees will be examined by the
>>
>> s/working tree/worktree/?
>
> Nope. It's the "working tree" that we consistently use throughout
> git-worktree.txt

OK.


Re: [PATCH v2 12/12] rev-list: expose and document --single-worktree

2017-04-19 Thread Duy Nguyen
On Sun, Mar 19, 2017 at 1:00 AM, Junio C Hamano  wrote:
>> diff --git a/Documentation/rev-list-options.txt 
>> b/Documentation/rev-list-options.txt
>> index a02f7324c0..c71e94b2d0 100644
>> --- a/Documentation/rev-list-options.txt
>> +++ b/Documentation/rev-list-options.txt
>> @@ -179,6 +179,14 @@ explicitly.
>>   Pretend as if all objects mentioned by reflogs are listed on the
>>   command line as ``.
>>
>> +--single-worktree::
>> + By default, all working trees will be examined by the
>
> s/working tree/worktree/?

Nope. It's the "working tree" that we consistently use throughout
git-worktree.txt
-- 
Duy


Re: [PATCH v2 12/12] rev-list: expose and document --single-worktree

2017-03-18 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy   writes:

> ---

Missing sign-off.

>  Documentation/rev-list-options.txt | 8 
>  revision.c | 2 ++
>  2 files changed, 10 insertions(+)
>
> diff --git a/Documentation/rev-list-options.txt 
> b/Documentation/rev-list-options.txt
> index a02f7324c0..c71e94b2d0 100644
> --- a/Documentation/rev-list-options.txt
> +++ b/Documentation/rev-list-options.txt
> @@ -179,6 +179,14 @@ explicitly.
>   Pretend as if all objects mentioned by reflogs are listed on the
>   command line as ``.
>  
> +--single-worktree::
> + By default, all working trees will be examined by the

s/working tree/worktree/?

> + following options when there are more than one (see
> + linkgit:git-worktree[1]): `--all`, `--reflog` and
> + `--indexed-objects`.
> + This option forces them to examine the current working tree
> + only.
> +
>  --ignore-missing::
>   Upon seeing an invalid object name in the input, pretend as if
>   the bad input was not given.
> diff --git a/revision.c b/revision.c
> index fcf165bd76..dc32e99c54 100644
> --- a/revision.c
> +++ b/revision.c
> @@ -,6 +,8 @@ static int handle_revision_pseudo_opt(const char 
> *submodule,
>   return error("invalid argument to --no-walk");
>   } else if (!strcmp(arg, "--do-walk")) {
>   revs->no_walk = 0;
> + } else if (!strcmp(arg, "--single-worktree")) {
> + revs->single_worktree = 1;
>   } else {
>   return 0;
>   }


[PATCH v2 12/12] rev-list: expose and document --single-worktree

2017-03-18 Thread Nguyễn Thái Ngọc Duy
---
 Documentation/rev-list-options.txt | 8 
 revision.c | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/Documentation/rev-list-options.txt 
b/Documentation/rev-list-options.txt
index a02f7324c0..c71e94b2d0 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -179,6 +179,14 @@ explicitly.
Pretend as if all objects mentioned by reflogs are listed on the
command line as ``.
 
+--single-worktree::
+   By default, all working trees will be examined by the
+   following options when there are more than one (see
+   linkgit:git-worktree[1]): `--all`, `--reflog` and
+   `--indexed-objects`.
+   This option forces them to examine the current working tree
+   only.
+
 --ignore-missing::
Upon seeing an invalid object name in the input, pretend as if
the bad input was not given.
diff --git a/revision.c b/revision.c
index fcf165bd76..dc32e99c54 100644
--- a/revision.c
+++ b/revision.c
@@ -,6 +,8 @@ static int handle_revision_pseudo_opt(const char 
*submodule,
return error("invalid argument to --no-walk");
} else if (!strcmp(arg, "--do-walk")) {
revs->no_walk = 0;
+   } else if (!strcmp(arg, "--single-worktree")) {
+   revs->single_worktree = 1;
} else {
return 0;
}
-- 
2.11.0.157.gd943d85