* [PATCH] Use "working tree" instead of "working directory" for git status
@ 2016-06-09 17:46 Lars Vogel
2016-06-09 17:55 ` Eric Sunshine
0 siblings, 1 reply; 6+ messages in thread
From: Lars Vogel @ 2016-06-09 17:46 UTC (permalink / raw)
To: git; +Cc: Lars Vogel
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.
---
po/bg.po | 2 +-
po/ca.po | 2 +-
po/de.po | 2 +-
po/fr.po | 2 +-
po/git.pot | 2 +-
po/ko.po | 2 +-
po/ru.po | 2 +-
po/sv.po | 2 +-
po/vi.po | 2 +-
po/zh_CN.po | 2 +-
wt-status.c | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/po/bg.po b/po/bg.po
index ac6f103..9390c81 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -2295,7 +2295,7 @@ msgstr ""
#: wt-status.c:1535
#, c-format
-msgid "nothing to commit, working directory clean\n"
+msgid "nothing to commit, working tree clean\n"
msgstr "липсват каквито и да е промени, работното дърво е чисто\n"
#: wt-status.c:1642
diff --git a/po/ca.po b/po/ca.po
index 46000d7..f54f137 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2318,7 +2318,7 @@ msgstr ""
#: wt-status.c:1535
#, c-format
-msgid "nothing to commit, working directory clean\n"
+msgid "nothing to commit, working tree clean\n"
msgstr "no hi ha res a cometre, directori de treball net\n"
#: wt-status.c:1642
diff --git a/po/de.po b/po/de.po
index 0eadf34..a14fe92 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2356,7 +2356,7 @@ msgstr ""
#: wt-status.c:1535
#, c-format
-msgid "nothing to commit, working directory clean\n"
+msgid "nothing to commit, working tree clean\n"
msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n"
#: wt-status.c:1642
diff --git a/po/fr.po b/po/fr.po
index 55ca387..627315c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2394,7 +2394,7 @@ msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"
#: wt-status.c:1535
#, c-format
-msgid "nothing to commit, working directory clean\n"
+msgid "nothing to commit, working tree clean\n"
msgstr "rien à valider, la copie de travail est propre\n"
#: wt-status.c:1642
diff --git a/po/git.pot b/po/git.pot
index 72ef798..2957091 100644
--- a/po/git.pot
+++ b/po/git.pot
@@ -2192,7 +2192,7 @@ msgstr ""
#: wt-status.c:1535
#, c-format
-msgid "nothing to commit, working directory clean\n"
+msgid "nothing to commit, working tree clean\n"
msgstr ""
#: wt-status.c:1642
diff --git a/po/ko.po b/po/ko.po
index 3ff3b9b..9520e04 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2313,7 +2313,7 @@ msgstr ""
#: wt-status.c:1535
#, c-format
-msgid "nothing to commit, working directory clean\n"
+msgid "nothing to commit, working tree clean\n"
msgstr "커밋할 사항 없음, 작업 폴더 깨끗함\n"
#: wt-status.c:1642
diff --git a/po/ru.po b/po/ru.po
index c0a838b..6fe8c09 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2233,7 +2233,7 @@ msgstr "нечего коммитить (используйте опцию «-u
#: wt-status.c:1535
#, c-format
-msgid "nothing to commit, working directory clean\n"
+msgid "nothing to commit, working tree clean\n"
msgstr "нечего коммитить, нет изменений в рабочем каталоге\n"
#: wt-status.c:1642
diff --git a/po/sv.po b/po/sv.po
index 32bcaba..801a816 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2289,7 +2289,7 @@ msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"
#: wt-status.c:1535
#, c-format
-msgid "nothing to commit, working directory clean\n"
+msgid "nothing to commit, working tree clean\n"
msgstr "inget att checka in, arbetskatalogen ren\n"
#: wt-status.c:1642
diff --git a/po/vi.po b/po/vi.po
index edd8e29..18fbdef 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -2306,7 +2306,7 @@ msgstr ""
#: wt-status.c:1535
#, c-format
-msgid "nothing to commit, working directory clean\n"
+msgid "nothing to commit, working tree clean\n"
msgstr "không có gì để chuyển giao, thư mục làm việc sạch sẽ\n"
#: wt-status.c:1642
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a6b06f9..b76f2c0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2421,7 +2421,7 @@ msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"
# 译者：中文字符串拼接，可删除前导空格
#: wt-status.c:1535
#, c-format
-msgid "nothing to commit, working directory clean\n"
+msgid "nothing to commit, working tree clean\n"
msgstr "无文件要提交，干净的工作区\n"
# 译者：注意保持句尾空格
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] Use "working tree" instead of "working directory" for git status
2016-06-09 17:46 [PATCH] Use "working tree" instead of "working directory" for git status Lars Vogel
@ 2016-06-09 17:55 ` Eric Sunshine
2016-06-09 18:21 ` Lars Vogel
0 siblings, 1 reply; 6+ messages in thread
From: Eric Sunshine @ 2016-06-09 17:55 UTC (permalink / raw)
To: Lars Vogel; +Cc: Git List, Lars Vogel
On Thu, Jun 9, 2016 at 1:46 PM, Lars Vogel <lars.vogel@gmail.com> wrote:
> 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.
Missing sign-off.
> ---
> po/bg.po | 2 +-
> po/ca.po | 2 +-
> po/de.po | 2 +-
> po/fr.po | 2 +-
> po/git.pot | 2 +-
> po/ko.po | 2 +-
> po/ru.po | 2 +-
> po/sv.po | 2 +-
> po/vi.po | 2 +-
> po/zh_CN.po | 2 +-
> wt-status.c | 2 +-
Don't bother updating the .po files; that's the job of the
translators. Your patch should touch only wt-status.c.
> 11 files changed, 11 insertions(+), 11 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] Use "working tree" instead of "working directory" for git status
@ 2016-06-09 18:19 Lars Vogel
2016-06-09 19:46 ` Matthieu Moy
0 siblings, 1 reply; 6+ messages in thread
From: Lars Vogel @ 2016-06-09 18:19 UTC (permalink / raw)
To: git; +Cc: Lars Vogel
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(-)
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] Use "working tree" instead of "working directory" for git status
2016-06-09 17:55 ` Eric Sunshine
@ 2016-06-09 18:21 ` Lars Vogel
0 siblings, 0 replies; 6+ messages in thread
From: Lars Vogel @ 2016-06-09 18:21 UTC (permalink / raw)
To: Eric Sunshine; +Cc: Lars Vogel, Git List
Thanks updated patch on its way.
On Thu, Jun 9, 2016 at 7:55 PM, Eric Sunshine <sunshine@sunshineco.com> wrote:
> On Thu, Jun 9, 2016 at 1:46 PM, Lars Vogel <lars.vogel@gmail.com> wrote:
>> 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.
>
> Missing sign-off.
>
>> ---
>> po/bg.po | 2 +-
>> po/ca.po | 2 +-
>> po/de.po | 2 +-
>> po/fr.po | 2 +-
>> po/git.pot | 2 +-
>> po/ko.po | 2 +-
>> po/ru.po | 2 +-
>> po/sv.po | 2 +-
>> po/vi.po | 2 +-
>> po/zh_CN.po | 2 +-
>> wt-status.c | 2 +-
>
> Don't bother updating the .po files; that's the job of the
> translators. Your patch should touch only wt-status.c.
>
>> 11 files changed, 11 insertions(+), 11 deletions(-)
--
Eclipse Platform UI and e4 project co-lead
CEO vogella GmbH
Haindaalwisch 17a, 22395 Hamburg
Amtsgericht Hamburg: HRB 127058
Geschäftsführer: Lars Vogel, Jennifer Nerlich de Vogel
USt-IdNr.: DE284122352
Fax (040) 5247 6322, Email: lars.vogel@vogella.com, Web: http://www.vogella.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Use "working tree" instead of "working directory" for git status
2016-06-09 18:19 Lars Vogel
@ 2016-06-09 19:46 ` Matthieu Moy
2016-06-09 19:59 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Matthieu Moy @ 2016-06-09 19:46 UTC (permalink / raw)
To: Lars Vogel; +Cc: git, Lars Vogel
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.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Use "working tree" instead of "working directory" for git status
2016-06-09 19:46 ` Matthieu Moy
@ 2016-06-09 19:59 ` Junio C Hamano
0 siblings, 0 replies; 6+ messages in thread
From: Junio C Hamano @ 2016-06-09 19:59 UTC (permalink / raw)
To: Matthieu Moy; +Cc: Lars Vogel, git, Lars Vogel
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
> 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.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-06-09 19:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-09 17:46 [PATCH] Use "working tree" instead of "working directory" for git status Lars Vogel
2016-06-09 17:55 ` Eric Sunshine
2016-06-09 18:21 ` Lars Vogel
-- strict thread matches above, loose matches on Subject: below --
2016-06-09 18:19 Lars Vogel
2016-06-09 19:46 ` Matthieu Moy
2016-06-09 19:59 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).