threads / patch / 42565

patchUse "working tree" instead of "working directory" for git status

Subject: [PATCH] Use "working tree" instead of "working directory" for git status

## tl;dr

3 messages between Jun 16, 2016 and Jun 16, 2016. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Lars Vogel· Jun 9, 2016, 18:19 UTC · lore

Working directory can be easily confused with the current directory. In one of my patches I already updated the usage of working directory with working tree for the man page but I noticed that git status also uses this incorrect term.

Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
---
 wt-status.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to wt-status.c +1 −1

diff --git a/wt-status.c b/wt-status.c
index 4f27bd6..4ce4e35 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -1554,7 +1554,7 @@ void wt_status_print(struct wt_status *s)
 			else
 				printf(_("nothing to commit\n"));
 		} else
-			printf(_("nothing to commit, working directory clean\n"));
+			printf(_("nothing to commit, working tree clean\n"));
 	}
 }

-- 
2.8.1

Matthieu Moy· Jun 9, 2016, 19:46 UTC · re: Lars Vogel · lore

Re: [PATCH] Use "working tree" instead of "working directory" for git status

Lars Vogel <lars.vogel@gmail.com> writes:

Show 8 quoted lines

> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -1554,7 +1554,7 @@ void wt_status_print(struct wt_status *s)
>  			else
>  				printf(_("nothing to commit\n"));
>  		} else
> -			printf(_("nothing to commit, working directory clean\n"));
> +			printf(_("nothing to commit, working tree clean\n"));

Looks good to me, thanks.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

Junio C Hamano· Jun 9, 2016, 19:59 UTC · re: Matthieu Moy · lore

Re: [PATCH] Use "working tree" instead of "working directory" for git status

Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:

Show 12 quoted lines

> Lars Vogel <lars.vogel@gmail.com> writes:
>
>> --- a/wt-status.c
>> +++ b/wt-status.c
>> @@ -1554,7 +1554,7 @@ void wt_status_print(struct wt_status *s)
>>  			else
>>  				printf(_("nothing to commit\n"));
>>  		} else
>> -			printf(_("nothing to commit, working directory clean\n"));
>> +			printf(_("nothing to commit, working tree clean\n"));
>
> Looks good to me, thanks.

Thanks, all.  Queued.