* [PATCH] Add it.po file
From: Paolo Ciarrocchi @ 2007-07-22 10:40 UTC (permalink / raw)
To: git
This patch add a file, it.po that will be translated in Italian with the following patch
---
po/it.po | 258 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 258 insertions(+), 0 deletions(-)
create mode 100644 po/it.po
diff --git a/po/it.po b/po/it.po
new file mode 100644
index 0000000..e8b8cdb
--- /dev/null
+++ b/po/it.po
@@ -0,0 +1,258 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-07-21 20:31+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: git-gui.sh:1669
+msgid "Repository"
+msgstr ""
+
+#: git-gui.sh:1670
+msgid "Edit"
+msgstr ""
+
+#: git-gui.sh:1672
+msgid "Branch"
+msgstr ""
+
+#: git-gui.sh:1675 git-gui.sh:1853 git-gui.sh:2192
+msgid "Commit"
+msgstr ""
+
+#: git-gui.sh:1678
+msgid "Merge"
+msgstr ""
+
+#: git-gui.sh:1679
+msgid "Fetch"
+msgstr ""
+
+#: git-gui.sh:1680 git-gui.sh:2198
+msgid "Push"
+msgstr ""
+
+#: git-gui.sh:1689
+msgid "Browse Current Branch's Files"
+msgstr ""
+
+#: git-gui.sh:1698
+msgid "Visualize Current Branch's History"
+msgstr ""
+
+#: git-gui.sh:1702
+msgid "Visualize All Branch History"
+msgstr ""
+
+#: git-gui.sh:1707
+msgid "Database Statistics"
+msgstr ""
+
+#: git-gui.sh:1710
+msgid "Compress Database"
+msgstr ""
+
+#: git-gui.sh:1713
+msgid "Verify Database"
+msgstr ""
+
+#: git-gui.sh:1720 git-gui.sh:1724 git-gui.sh:1728
+msgid "Create Desktop Icon"
+msgstr ""
+
+#: git-gui.sh:1733
+msgid "Quit"
+msgstr ""
+
+#: git-gui.sh:1740
+msgid "Undo"
+msgstr ""
+
+#: git-gui.sh:1743
+msgid "Redo"
+msgstr ""
+
+#: git-gui.sh:1747 git-gui.sh:2262
+msgid "Cut"
+msgstr ""
+
+#: git-gui.sh:1750 git-gui.sh:2265 git-gui.sh:2336 git-gui.sh:2408
+msgid "Copy"
+msgstr ""
+
+#: git-gui.sh:1753 git-gui.sh:2268
+msgid "Paste"
+msgstr ""
+
+#: git-gui.sh:1756 git-gui.sh:2271
+msgid "Delete"
+msgstr ""
+
+#: git-gui.sh:1760 git-gui.sh:2275 git-gui.sh:2412
+msgid "Select All"
+msgstr ""
+
+#: git-gui.sh:1769
+msgid "Create..."
+msgstr ""
+
+#: git-gui.sh:1775
+msgid "Checkout..."
+msgstr ""
+
+#: git-gui.sh:1781
+msgid "Rename..."
+msgstr ""
+
+#: git-gui.sh:1786 git-gui.sh:1884
+msgid "Delete..."
+msgstr ""
+
+#: git-gui.sh:1791
+msgid "Reset..."
+msgstr ""
+
+#: git-gui.sh:1803 git-gui.sh:2209
+msgid "New Commit"
+msgstr ""
+
+#: git-gui.sh:1811 git-gui.sh:2216
+msgid "Amend Last Commit"
+msgstr ""
+
+#: git-gui.sh:1820 git-gui.sh:2176
+msgid "Rescan"
+msgstr ""
+
+#: git-gui.sh:1826
+msgid "Add To Commit"
+msgstr ""
+
+#: git-gui.sh:1831
+msgid "Add Existing To Commit"
+msgstr ""
+
+#: git-gui.sh:1837
+msgid "Unstage From Commit"
+msgstr ""
+
+#: git-gui.sh:1842
+msgid "Revert Changes"
+msgstr ""
+
+#: git-gui.sh:1849 git-gui.sh:2188 git-gui.sh:2286
+msgid "Sign Off"
+msgstr ""
+
+#: git-gui.sh:1864
+msgid "Local Merge..."
+msgstr ""
+
+#: git-gui.sh:1869
+msgid "Abort Merge..."
+msgstr ""
+
+#: git-gui.sh:1881
+msgid "Push..."
+msgstr ""
+
+#: git-gui.sh:1891
+msgid "Apple"
+msgstr ""
+
+#: git-gui.sh:1894 git-gui.sh:1941
+#, tcl-format
+msgid "About %s"
+msgstr ""
+
+#: git-gui.sh:1896 git-gui.sh:1902 git-gui.sh:2454
+msgid "Options..."
+msgstr ""
+
+#: git-gui.sh:1937
+msgid "Help"
+msgstr ""
+
+#: git-gui.sh:1978
+msgid "Online Documentation"
+msgstr ""
+
+#: git-gui.sh:2094
+msgid "Current Branch:"
+msgstr ""
+
+#: git-gui.sh:2115
+msgid "Staged Changes (Will Be Committed)"
+msgstr ""
+
+#: git-gui.sh:2135
+msgid "Unstaged Changes (Will Not Be Committed)"
+msgstr ""
+
+#: git-gui.sh:2182
+msgid "Add Existing"
+msgstr ""
+
+#: git-gui.sh:2228
+msgid "Initial Commit Message:"
+msgstr ""
+
+#: git-gui.sh:2229
+msgid "Amended Commit Message:"
+msgstr ""
+
+#: git-gui.sh:2230
+msgid "Amended Initial Commit Message:"
+msgstr ""
+
+#: git-gui.sh:2231
+msgid "Amended Merge Commit Message:"
+msgstr ""
+
+#: git-gui.sh:2232
+msgid "Merge Commit Message:"
+msgstr ""
+
+#: git-gui.sh:2233
+msgid "Commit Message:"
+msgstr ""
+
+#: git-gui.sh:2278 git-gui.sh:2416
+msgid "Copy All"
+msgstr ""
+
+#: git-gui.sh:2404
+msgid "Refresh"
+msgstr ""
+
+#: git-gui.sh:2425
+msgid "Apply/Reverse Hunk"
+msgstr ""
+
+#: git-gui.sh:2431
+msgid "Decrease Font Size"
+msgstr ""
+
+#: git-gui.sh:2435
+msgid "Increase Font Size"
+msgstr ""
+
+#: git-gui.sh:2440
+msgid "Show Less Context"
+msgstr ""
+
+#: git-gui.sh:2447
+msgid "Show More Context"
+msgstr ""
--
1.5.3.rc2.29.gc4640f
^ permalink raw reply related
* [PATCH] Fix update-po target to call msgmerge with right parameters
From: Alex Riesen @ 2007-07-22 10:19 UTC (permalink / raw)
To: git; +Cc: Johannes Schindelin, Shawn O. Pearce
Add accidentally forgotten semicolon at the end of msgmerge command line
---
Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 52975a7..2c9b3ad 100644
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,7 @@ ALL_MSGFILES = $(subst .po,.msg,$(ALL_POFILES))
$(PO_TEMPLATE): $(SCRIPT_SH) $(ALL_LIBFILES)
$(XGETTEXT) -kmc -LTcl -o $@ $(SCRIPT_SH) $(ALL_LIBFILES)
update-po:: $(PO_TEMPLATE)
- $(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) )
+ $(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; )
$(ALL_MSGFILES): %.msg : %.po
@echo Generating catalog $@
msgfmt --statistics --tcl $< -l $(basename $(notdir $<)) -d $(dir $@)
--
1.5.3.rc2.37.g67fa
^ permalink raw reply related
* Re: [PATCH] Update Japanese messages
From: Junio C Hamano @ 2007-07-22 9:45 UTC (permalink / raw)
To: しらいしななこ,
Johannes Schindelin
Cc: git
In-Reply-To: <20070624192215.6117@nanako3.bluebottle.com>
Thanks. Me being a Japanese, it would have been very
embarrasing to keep a very incomplete Japanese message file in
the project ;-).
The translation looks good. Johannes, if you haven't got around
it yet, please apply.
^ permalink raw reply
* Re: [PATCH] Avoid to duplicate commit message when is not encoded
From: Junio C Hamano @ 2007-07-22 9:17 UTC (permalink / raw)
To: Alex Riesen; +Cc: Marco Costalba, Git Mailing List
In-Reply-To: <20070722085225.GB3408@steel.home>
Alex Riesen <raa.lkml@gmail.com> writes:
> Marco Costalba, Sun, Jul 22, 2007 10:23:05 +0200:
>> + if (encoding) // we'll strip encoding header later
>
> You better avoid using C++ comments, not all C compilers support them.
I've "fixed" them.
>> + else
>> + return NULL; // nothing to do
>
> And you better avoid such useless comments too
I think this one is probably a good-to-have. It really needs a
bit of thinking why there is nothing to do in this case. At
least for me it did ;-)
^ permalink raw reply
* Re: [PATCH] Documentation/gitignore.txt: Fix the seriously misleading priority explanation
From: David Kastrup @ 2007-07-22 9:12 UTC (permalink / raw)
To: git
In-Reply-To: <7v4pjxt1nk.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano <gitster@pobox.com> writes:
> Your rewrite makes "patterns found in deeper file overrides the
> ones in shallower ones" rule much much easier to read. Thanks.
Well, it is nice for a change to be able to explain something in a way
that people understand.
--
David Kastrup, Kriemhildstr. 15, 44793 Bochum
^ permalink raw reply
* Re: [PATCH] Avoid to duplicate commit message when is not encoded
From: Alex Riesen @ 2007-07-22 8:52 UTC (permalink / raw)
To: Marco Costalba; +Cc: Junio C Hamano, Git Mailing List
In-Reply-To: <e5bfff550707220123g5826cbf5n3e2ff7256d9b5366@mail.gmail.com>
Marco Costalba, Sun, Jul 22, 2007 10:23:05 +0200:
> + if (encoding) // we'll strip encoding header later
You better avoid using C++ comments, not all C compilers support them.
> + else
> + return NULL; // nothing to do
And you better avoid such useless comments too
^ permalink raw reply
* Re: [RFC PATCH] Re: Empty directories...
From: David Kastrup @ 2007-07-22 9:08 UTC (permalink / raw)
To: david; +Cc: Linus Torvalds, git
In-Reply-To: <Pine.LNX.4.64.0707212332530.6350@asgard.lang.hm>
david@lang.hm writes:
> On Sun, 22 Jul 2007, David Kastrup wrote:
>
>> Linus Torvalds <torvalds@linux-foundation.org> writes:
>>
>>> I told you. Several times. That "." is pointless exactly because
>>> it's in _every_ tree, and as such is no longer "content".
>>
>> "." is in every _non-empty_ directory tree. But we are talking
>> about permitting _empty_ trees in the repository. And for an empty
>> tree in the repository, "." may or may not be in the corresponding
>> work directory tree, depending on whether the directory exists or
>> not. So when we are talking about a repository tree _becoming_
>> empty, we need the information whether or whether not we should
>> remove it upon becoming empty. _That_ is the information content
>> of "." being or not being considered part of the trackable
>> material. And the information is no longer available at the time
>> the repository tree becomes empty _unless_ we already store it
>> there when the tree is still populated.
>
> David, the point where you and Linus are talking past each other is
> that Linus is assuming that you only want to track some specific
> directories, and for that tracking "." doesn't work becouse it's in
> every directory
>
> you apparently consider every directory equal and therefor the fact
> that "." exists in every directory doesn't bother you becouse you
> want to track every directory.
Sigh. No, I don't want to track every directory. I want to have
every directory _trackable_. Whether it is _tracked_ depends on
whether you _add_ it to the index. And that depends, among other
things, on the gitignore patterns, and those can be specified on a
per-directory, per-project, per-user preference.
> what you are not hearing is that while Linus and the other git
> developers can see reasons to track directories sometimes, they
> definantly don't agree that you want to track directories all the
> time.
And that is why one can use per-directory, per-project and per-user
settings to turn the tracking off, _and_ one can decide at what level
one adds information to the index. If you always make it a habit to
only ever use git-add -f and git-rm -f on _files_ and never on
directories, you won't _ever_ see a difference on whether directories
are tracked, and the contents of .gitignore won't make a difference,
either.
But if you use git-add and git-rm on directories, then for the
specified directory and its children, .gitignore gets consulted.
> sometimes the fact that a directory exists is significant, most of
> the time it's not. and the difference between what is and what isn't
> significant isn't a per-repository or per-project thing, it's a
> per-directory thing.
Which is why one can control it per-directory using either the
.gitignore mechanism _or_ by including the directory level in question
in the git-add and git-rm commands or not.
> in one repository you will have some directories that only exist
> becouse files are in them, and you may have some directories that
> exist becouse you explicitly want them to exist.
>
> both types have the "." file in them (or appear to, some
> OS's/filesystems don't actually have a "." on disk, they add it when
> needed when reporting to userspace), so git has no way to tell which
> ones you explicitly want tracked.
Like with any other file, git _has_ a way to tell. If I don't git-add
or git-rm the directory or one of its parents to the index, I don't
want to have it tracked. And if I add the directory or one of its
parents to the index recursively, but it is covered by .gitignore, I
don't want to have it tracked.
It is a pity that you have seemingly not read on, because there
follows a simple example:
>> Ok, here we go _again_. Test case 1:
>>
>> mkdir a
>> touch a/b
>> git-add a/b
>> git-commit -m x
>> git-rm a/b
>> git-commit -m x
>>
>> Now we want to have the directory a _removed_.
>>
>> Test case 2:
>>
>> mkdir a
>> touch a/b
>> git-add a
>> git-commit -m x
>> git-rm a/b
>> git-commit -m x
>>
>> Now we want to have the directory a _retained_.
>>
>> After the first commit in _both_ test cases, the only file in the
>> trees / and /a is a/b. The working directory state is _identical_ at
>> this point, and we do identical commands afterwards.
>>
>> The end result is not identical, so there must be some information
>> different in the repository after the first commit. This information
>> _can't_ be encoded in a remaining empty tree, because both the trees /
>> and /a are _non_-empty yet.
>>
>> So we _must_ encode the evaporate-or-not-when-empty information
>> _otherwise_ into the repository. And we do that by _not_ having
>> /a/. in the set of tracked files in test case 1, and by _having_ it in
>> the set of tracked files in test case 2.
--
David Kastrup, Kriemhildstr. 15, 44793 Bochum
^ permalink raw reply
* Re: [PATCH] Initial Chinese translation
From: Junio C Hamano @ 2007-07-22 9:06 UTC (permalink / raw)
To: Xudong Guan
Cc: Shawn O. Pearce, git, Johannes Schindelin, Paolo Ciarrocchi,
しらいしななこ,
Christian Stimming
In-Reply-To: <20070722085338.GA18268@xguan-laptop>
Xudong Guan <xudong.guan@gmail.com> writes:
> On 01:06 Sun 22 Jul , Junio C Hamano wrote:
>> Yeah, I was hinting to rename this file to zh_CN.po from day
>> one.
>
> I agree.
>
> I am new to the patch-in-email way of doing things...
Well, as Johannes already has your original patch in his tree,
it probably is easiest to give him an email requesting a rename
on his end ;-).
^ permalink raw reply
* Re: [PATCH] Initial Chinese translation
From: Xudong Guan @ 2007-07-22 8:53 UTC (permalink / raw)
To: Junio C Hamano
Cc: Shawn O. Pearce, git, Johannes Schindelin, Paolo Ciarrocchi,
しらいしななこ,
Christian Stimming
In-Reply-To: <7vhcnwsvzd.fsf@assigned-by-dhcp.cox.net>
On 01:06 Sun 22 Jul , Junio C Hamano wrote:
> Yeah, I was hinting to rename this file to zh_CN.po from day
> one.
I agree.
I am new to the patch-in-email way of doing things. If I could do
better, please give me hints. Can I push directly to mob? Like:
$ git clone http://repo.or.cz/r/git-gui/git-gui-i18n
hack hack hack ....
$ git push http://repo.or.cz/r/git-gui/git-gui-i18n master:mob
-- >8 --
From 936787ddbdeaf0bcecbb1359179dae90c20418b0 Mon Sep 17 00:00:00 2001
From: Xudong Guan <xudong.guan@gmail.com>
Date: Sun, 22 Jul 2007 09:41:12 +0100
Subject: [PATCH] git-gui: renamed po/zh.po -> po/zh_CN.po
---
po/zh.po | 250 -----------------------------------------------------------
po/zh_CN.po | 250 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 250 insertions(+), 250 deletions(-)
delete mode 100644 po/zh.po
create mode 100644 po/zh_CN.po
diff --git a/po/zh.po b/po/zh.po
deleted file mode 100644
index bea5e54..0000000
--- a/po/zh.po
+++ /dev/null
@@ -1,250 +0,0 @@
-# Translation of git-gui to Chinese
-# Copyright (C) 2007 Shawn Pearce
-# This file is distributed under the same license as the git-gui package.
-# Xudong Guan <xudong.guan@gmail.com>, 2007.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: git-gui\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-21 23:46+0100\n"
-"PO-Revision-Date: 2007-07-21 01:23-0700\n"
-"Last-Translator: Xudong Guan <xudong.guan@gmail.com>\n"
-"Language-Team: Chinese\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: git-gui.sh:1656
-msgid "Repository"
-msgstr "版本树"
-
-#: git-gui.sh:1657
-msgid "Edit"
-msgstr "编辑"
-
-#: git-gui.sh:1659
-msgid "Branch"
-msgstr "分支"
-
-#: git-gui.sh:1662 git-gui.sh:1840
-msgid "Commit"
-msgstr "提交"
-
-#: git-gui.sh:1665
-msgid "Merge"
-msgstr "合并"
-
-#: git-gui.sh:1666
-msgid "Fetch"
-msgstr "导入"
-
-#: git-gui.sh:1667
-msgid "Push"
-msgstr "上传"
-
-#: git-gui.sh:1676
-msgid "Browse Current Branch's Files"
-msgstr "浏览当前分支文件"
-
-#: git-gui.sh:1685
-msgid "Visualize Current Branch's History"
-msgstr "调用gitk显示当前分支"
-
-#: git-gui.sh:1689
-msgid "Visualize All Branch History"
-msgstr "调用gitk显示所有分支"
-
-#: git-gui.sh:1694
-msgid "Database Statistics"
-msgstr "数据库统计数据"
-
-#: git-gui.sh:1697
-msgid "Compress Database"
-msgstr "压缩数据库"
-
-#: git-gui.sh:1700
-msgid "Verify Database"
-msgstr "验证数据库"
-
-#: git-gui.sh:1707 git-gui.sh:1711 git-gui.sh:1715
-msgid "Create Desktop Icon"
-msgstr "创建桌面图标"
-
-#: git-gui.sh:1720
-msgid "Quit"
-msgstr "退出"
-
-#: git-gui.sh:1727
-msgid "Undo"
-msgstr "撤销"
-
-#: git-gui.sh:1730
-msgid "Redo"
-msgstr "重做"
-
-#: git-gui.sh:1734 git-gui.sh:2249
-msgid "Cut"
-msgstr "剪切"
-
-#: git-gui.sh:1737 git-gui.sh:2252 git-gui.sh:2323 git-gui.sh:2395
-msgid "Copy"
-msgstr "复制"
-
-#: git-gui.sh:1740 git-gui.sh:2255
-msgid "Paste"
-msgstr "粘贴"
-
-#: git-gui.sh:1743 git-gui.sh:2258
-msgid "Delete"
-msgstr "删除"
-
-#: git-gui.sh:1747 git-gui.sh:2262 git-gui.sh:2399
-msgid "Select All"
-msgstr "全选"
-
-#: git-gui.sh:1756
-msgid "Create..."
-msgstr "新建..."
-
-#: git-gui.sh:1762
-msgid "Checkout..."
-msgstr "切换..."
-
-#: git-gui.sh:1768
-msgid "Rename..."
-msgstr "改名..."
-
-#: git-gui.sh:1773 git-gui.sh:1871
-msgid "Delete..."
-msgstr "删除..."
-
-#: git-gui.sh:1778
-msgid "Reset..."
-msgstr "重置所有修动..."
-
-#: git-gui.sh:1790
-msgid "New Commit"
-msgstr "新提交"
-
-#: git-gui.sh:1798
-msgid "Amend Last Commit"
-msgstr "修订上次提交"
-
-#: git-gui.sh:1807
-msgid "Rescan"
-msgstr "重新扫描"
-
-#: git-gui.sh:1813
-msgid "Add To Commit"
-msgstr "添加到本次提交"
-
-#: git-gui.sh:1818
-msgid "Add Existing To Commit"
-msgstr "添加默认修改文件"
-
-#: git-gui.sh:1824
-msgid "Unstage From Commit"
-msgstr "从本次提交移除"
-
-#: git-gui.sh:1829
-msgid "Revert Changes"
-msgstr "恢复修改"
-
-#: git-gui.sh:1836 git-gui.sh:2273
-msgid "Sign Off"
-msgstr "签名"
-
-#: git-gui.sh:1851
-msgid "Local Merge..."
-msgstr "本地合并..."
-
-#: git-gui.sh:1856
-msgid "Abort Merge..."
-msgstr "取消合并..."
-
-#: git-gui.sh:1868
-msgid "Push..."
-msgstr "上传..."
-
-#: git-gui.sh:1878
-msgid "Apple"
-msgstr "苹果"
-
-#: git-gui.sh:1881 git-gui.sh:1928
-#, tcl-format
-msgid "About %s"
-msgstr "关于%s"
-
-#: git-gui.sh:1883 git-gui.sh:1889 git-gui.sh:2441
-msgid "Options..."
-msgstr "选项..."
-
-#: git-gui.sh:1913
-msgid "Tools"
-msgstr "工具"
-
-#: git-gui.sh:1915
-msgid "Migrate"
-msgstr "移植"
-
-#: git-gui.sh:1924
-msgid "Help"
-msgstr "帮助"
-
-#: git-gui.sh:1965
-msgid "Online Documentation"
-msgstr "在线文档"
-
-#: git-gui.sh:2215
-msgid "Initial Commit Message:"
-msgstr "初始提交描述:"
-
-#: git-gui.sh:2216
-msgid "Amended Commit Message:"
-msgstr "修订提交描述:"
-
-#: git-gui.sh:2217
-msgid "Amended Initial Commit Message:"
-msgstr "修订初始提交描述:"
-
-#: git-gui.sh:2218
-msgid "Amended Merge Commit Message:"
-msgstr "修订合并提交描述:"
-
-#: git-gui.sh:2219
-msgid "Merge Commit Message:"
-msgstr "合并提交描述:"
-
-#: git-gui.sh:2220
-msgid "Commit Message:"
-msgstr "提交描述:"
-
-#: git-gui.sh:2265 git-gui.sh:2403
-msgid "Copy All"
-msgstr "全部复制"
-
-#: git-gui.sh:2391
-msgid "Refresh"
-msgstr "刷新"
-
-#: git-gui.sh:2412
-msgid "Apply/Reverse Hunk"
-msgstr ""
-
-#: git-gui.sh:2418
-msgid "Decrease Font Size"
-msgstr "缩小字体"
-
-#: git-gui.sh:2422
-msgid "Increase Font Size"
-msgstr "放大字体"
-
-#: git-gui.sh:2427
-msgid "Show Less Context"
-msgstr "显示更多diff上下文"
-
-#: git-gui.sh:2434
-msgid "Show More Context"
-msgstr "显示更少diff上下文"
diff --git a/po/zh_CN.po b/po/zh_CN.po
new file mode 100644
index 0000000..bea5e54
--- /dev/null
+++ b/po/zh_CN.po
@@ -0,0 +1,250 @@
+# Translation of git-gui to Chinese
+# Copyright (C) 2007 Shawn Pearce
+# This file is distributed under the same license as the git-gui package.
+# Xudong Guan <xudong.guan@gmail.com>, 2007.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: git-gui\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-07-21 23:46+0100\n"
+"PO-Revision-Date: 2007-07-21 01:23-0700\n"
+"Last-Translator: Xudong Guan <xudong.guan@gmail.com>\n"
+"Language-Team: Chinese\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: git-gui.sh:1656
+msgid "Repository"
+msgstr "版本树"
+
+#: git-gui.sh:1657
+msgid "Edit"
+msgstr "编辑"
+
+#: git-gui.sh:1659
+msgid "Branch"
+msgstr "分支"
+
+#: git-gui.sh:1662 git-gui.sh:1840
+msgid "Commit"
+msgstr "提交"
+
+#: git-gui.sh:1665
+msgid "Merge"
+msgstr "合并"
+
+#: git-gui.sh:1666
+msgid "Fetch"
+msgstr "导入"
+
+#: git-gui.sh:1667
+msgid "Push"
+msgstr "上传"
+
+#: git-gui.sh:1676
+msgid "Browse Current Branch's Files"
+msgstr "浏览当前分支文件"
+
+#: git-gui.sh:1685
+msgid "Visualize Current Branch's History"
+msgstr "调用gitk显示当前分支"
+
+#: git-gui.sh:1689
+msgid "Visualize All Branch History"
+msgstr "调用gitk显示所有分支"
+
+#: git-gui.sh:1694
+msgid "Database Statistics"
+msgstr "数据库统计数据"
+
+#: git-gui.sh:1697
+msgid "Compress Database"
+msgstr "压缩数据库"
+
+#: git-gui.sh:1700
+msgid "Verify Database"
+msgstr "验证数据库"
+
+#: git-gui.sh:1707 git-gui.sh:1711 git-gui.sh:1715
+msgid "Create Desktop Icon"
+msgstr "创建桌面图标"
+
+#: git-gui.sh:1720
+msgid "Quit"
+msgstr "退出"
+
+#: git-gui.sh:1727
+msgid "Undo"
+msgstr "撤销"
+
+#: git-gui.sh:1730
+msgid "Redo"
+msgstr "重做"
+
+#: git-gui.sh:1734 git-gui.sh:2249
+msgid "Cut"
+msgstr "剪切"
+
+#: git-gui.sh:1737 git-gui.sh:2252 git-gui.sh:2323 git-gui.sh:2395
+msgid "Copy"
+msgstr "复制"
+
+#: git-gui.sh:1740 git-gui.sh:2255
+msgid "Paste"
+msgstr "粘贴"
+
+#: git-gui.sh:1743 git-gui.sh:2258
+msgid "Delete"
+msgstr "删除"
+
+#: git-gui.sh:1747 git-gui.sh:2262 git-gui.sh:2399
+msgid "Select All"
+msgstr "全选"
+
+#: git-gui.sh:1756
+msgid "Create..."
+msgstr "新建..."
+
+#: git-gui.sh:1762
+msgid "Checkout..."
+msgstr "切换..."
+
+#: git-gui.sh:1768
+msgid "Rename..."
+msgstr "改名..."
+
+#: git-gui.sh:1773 git-gui.sh:1871
+msgid "Delete..."
+msgstr "删除..."
+
+#: git-gui.sh:1778
+msgid "Reset..."
+msgstr "重置所有修动..."
+
+#: git-gui.sh:1790
+msgid "New Commit"
+msgstr "新提交"
+
+#: git-gui.sh:1798
+msgid "Amend Last Commit"
+msgstr "修订上次提交"
+
+#: git-gui.sh:1807
+msgid "Rescan"
+msgstr "重新扫描"
+
+#: git-gui.sh:1813
+msgid "Add To Commit"
+msgstr "添加到本次提交"
+
+#: git-gui.sh:1818
+msgid "Add Existing To Commit"
+msgstr "添加默认修改文件"
+
+#: git-gui.sh:1824
+msgid "Unstage From Commit"
+msgstr "从本次提交移除"
+
+#: git-gui.sh:1829
+msgid "Revert Changes"
+msgstr "恢复修改"
+
+#: git-gui.sh:1836 git-gui.sh:2273
+msgid "Sign Off"
+msgstr "签名"
+
+#: git-gui.sh:1851
+msgid "Local Merge..."
+msgstr "本地合并..."
+
+#: git-gui.sh:1856
+msgid "Abort Merge..."
+msgstr "取消合并..."
+
+#: git-gui.sh:1868
+msgid "Push..."
+msgstr "上传..."
+
+#: git-gui.sh:1878
+msgid "Apple"
+msgstr "苹果"
+
+#: git-gui.sh:1881 git-gui.sh:1928
+#, tcl-format
+msgid "About %s"
+msgstr "关于%s"
+
+#: git-gui.sh:1883 git-gui.sh:1889 git-gui.sh:2441
+msgid "Options..."
+msgstr "选项..."
+
+#: git-gui.sh:1913
+msgid "Tools"
+msgstr "工具"
+
+#: git-gui.sh:1915
+msgid "Migrate"
+msgstr "移植"
+
+#: git-gui.sh:1924
+msgid "Help"
+msgstr "帮助"
+
+#: git-gui.sh:1965
+msgid "Online Documentation"
+msgstr "在线文档"
+
+#: git-gui.sh:2215
+msgid "Initial Commit Message:"
+msgstr "初始提交描述:"
+
+#: git-gui.sh:2216
+msgid "Amended Commit Message:"
+msgstr "修订提交描述:"
+
+#: git-gui.sh:2217
+msgid "Amended Initial Commit Message:"
+msgstr "修订初始提交描述:"
+
+#: git-gui.sh:2218
+msgid "Amended Merge Commit Message:"
+msgstr "修订合并提交描述:"
+
+#: git-gui.sh:2219
+msgid "Merge Commit Message:"
+msgstr "合并提交描述:"
+
+#: git-gui.sh:2220
+msgid "Commit Message:"
+msgstr "提交描述:"
+
+#: git-gui.sh:2265 git-gui.sh:2403
+msgid "Copy All"
+msgstr "全部复制"
+
+#: git-gui.sh:2391
+msgid "Refresh"
+msgstr "刷新"
+
+#: git-gui.sh:2412
+msgid "Apply/Reverse Hunk"
+msgstr ""
+
+#: git-gui.sh:2418
+msgid "Decrease Font Size"
+msgstr "缩小字体"
+
+#: git-gui.sh:2422
+msgid "Increase Font Size"
+msgstr "放大字体"
+
+#: git-gui.sh:2427
+msgid "Show Less Context"
+msgstr "显示更多diff上下文"
+
+#: git-gui.sh:2434
+msgid "Show More Context"
+msgstr "显示更少diff上下文"
--
1.5.0.rc3.81.g8188e
^ permalink raw reply related
* Re: segfault in diff-delta.c on mac os x (commit 8433669)
From: Steffen Prohaska @ 2007-07-22 8:49 UTC (permalink / raw)
To: Brian Gernhardt; +Cc: Git Mailing List
In-Reply-To: <233B9D70-9D91-4527-9801-7E2463ABDDAA@silverinsanity.com>
On Jul 22, 2007, at 5:35 AM, Brian Gernhardt wrote:
>
> On Jul 21, 2007, at 11:15 AM, Steffen Prohaska wrote:
>
>> 843366961cf14aad6490fbeb30f7b98f37f8833a may cause segfaults on
>> Mac OS X. See backtrace below. I only observed the segfault with
>> -O2 builds.
>
> I have been using git on my OS X box for quite a while, and that
> commit appears to be nearly two months old. I have yet to see any
> packing errors in any of my repositories. (This is with -O2, which
> appears to be the default.)
>
> My gcc reports itself as build 5367 instead of 5250. Perhaps there
> is a compiler error in an older copy of the DevTools?
This seems to be the case. I upgraded the compiler and
tried again. The segfault didn't happen again. Note, this
was not exactly the same situation as before because the
git repository used for testing changed a bit since the
first segfault.
I'll do some more repacking over the day and will report
my observations.
> Also, did this segfault occur with any publicly available repo or
> is it your own work?
It occurred on repacking a clone of
git://git.kernel.org/pub/scm/git/git.git.
Steffen
^ permalink raw reply
* Re: [PATCH] Avoid to duplicate commit message when is not encoded
From: Junio C Hamano @ 2007-07-22 8:40 UTC (permalink / raw)
To: Marco Costalba; +Cc: Git Mailing List
In-Reply-To: <e5bfff550707220123g5826cbf5n3e2ff7256d9b5366@mail.gmail.com>
Thanks.
^ permalink raw reply
* [PATCH] Avoid to duplicate commit message when is not encoded
From: Marco Costalba @ 2007-07-22 8:23 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Git Mailing List
When a commit message doesn't have encoding information
and encoding output is utf-8 (default) then an useless
xstrdup() of commit message is done.
If we assume most of users live in an utf-8 world, this
useless copy is the common case.
Performance issue found with KCachegrind.
Signed-off-by: Marco Costalba <mcostalba@gmail.com>
---
commit.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/commit.c b/commit.c
index 4c5dfa9..ba8413b 100644
--- a/commit.c
+++ b/commit.c
@@ -721,7 +721,10 @@ static char *logmsg_reencode(const
encoding = get_header(commit, "encoding");
use_encoding = encoding ? encoding : utf8;
if (!strcmp(use_encoding, output_encoding))
- out = xstrdup(commit->buffer);
+ if (encoding) // we'll strip encoding header later
+ out = xstrdup(commit->buffer);
+ else
+ return NULL; // nothing to do
else
out = reencode_string(commit->buffer,
output_encoding, use_encoding);
--
1.5.3.rc2.23.g4c77-dirty
^ permalink raw reply related
* Re: [PATCH] Initial Chinese translation
From: Junio C Hamano @ 2007-07-22 8:06 UTC (permalink / raw)
To: Shawn O. Pearce
Cc: Xudong Guan, git, Johannes Schindelin, Paolo Ciarrocchi,
しらいしななこ,
Christian Stimming
In-Reply-To: <20070722073519.GV32566@spearce.org>
"Shawn O. Pearce" <spearce@spearce.org> writes:
> Junio C Hamano <gitster@pobox.com> wrote:
>> Xudong Guan <xudong.guan@gmail.com> writes:
>>
>> > Simplified Chinese, in UTF-8 encoding.
>> >
>> > Signed-off-by: Xudong Guan <xudong.guan@gmail.com>
>> > ---
>> > po/zh.po | 250 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>> > 1 files changed, 250 insertions(+), 0 deletions(-)
>>
>> This raises another point in the current i18n scheme. How would
>> we allow zh_CN and zh_TW to coexist?
>
> They probably should be po/zh_CN.po and po/zh_TW.po.
Yeah, I was hinting to rename this file to zh_CN.po from day
one.
^ permalink raw reply
* Re: [PATCH 3/5] Internationalization of git-gui
From: Junio C Hamano @ 2007-07-22 8:05 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: Christian Stimming, Brett Schwarz, git, Paul Mackerras
In-Reply-To: <20070722074740.GY32566@spearce.org>
"Shawn O. Pearce" <spearce@spearce.org> writes:
> Christian Stimming <stimming@tuhh.de> wrote:
>> Subject: [PATCH] Initial German translation for testing of i18n.
> ...
>> diff --git a/po/de.po b/po/de.po
>> new file mode 100644
>> index 0000000..0592836
>> --- /dev/null
>> +++ b/po/de.po
>> @@ -0,0 +1,265 @@
>> +# Translation of git-gui to German.
>> +# Copyright (C) 2007 Linux Torvalds
>
> I didn't realize Linus wrote German. ;-)
>
> Or are you assigning the copyright to Linus, much as other chunks
> of Git are copyrighted by Linus?
The convention for xx.po, judging from the way template pot file
is written out, is to name the package's copyright holder, not
translation's, on that line. So Linus does not have to have
anything to do with the German part, but I think the appropriate
name to place there is yours.
^ permalink raw reply
* Re: [PATCH] Added 'git-rev-list --igrep' option for case insensitive grep
From: Dmitry Kakurin @ 2007-07-22 7:52 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7vwswtrmhe.fsf@assigned-by-dhcp.cox.net>
Sounds good to me.
Let's just put short option names in front of long names in the doc to
be consistent with other sections.
On 7/21/07, Junio C Hamano <gitster@pobox.com> wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
> > Are there notable side effects you would need to warn users
> > about?
> >
> > For example, what is the difference between "--igrep=foo
> > --author=bar" and "--grep=foo --author=bar"?
>
> Nah, let's not try to be too subtle. It does not work.
>
> What I am wondering is if there is an unintended option name
> conflict if we simply accept "-i" and "-E" as synonyms to
> "--regexp-ignore-case" and "--extended-regexp". The option
> parser for log family in revision.c is used from many places,
> so it is a bit hard to verify everobody to be absolutely sure,
> but I do not think of any offhand. There indeed are commands
> that take "-i" to mean something other than ignore-case, but
> ignore-case would not be meaningful for their operation.
>
> So I would rather prefer this replacement patch.
>
> -- >8 --
> Synonyms: -i == --regexp-ignore-case, -E == --extended-regexp
>
> These options to log family were too long to type. Give them
> shorter synonyms.
>
> Fix the parsing of the long options while at it.
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
> Documentation/git-rev-list.txt | 7 ++++---
> revision.c | 6 ++++--
> 2 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
> index 08e7573..f9fadaf 100644
> --- a/Documentation/git-rev-list.txt
> +++ b/Documentation/git-rev-list.txt
> @@ -27,7 +27,8 @@ SYNOPSIS
> [ \--cherry-pick ]
> [ \--encoding[=<encoding>] ]
> [ \--(author|committer|grep)=<pattern> ]
> - [ \--regexp-ignore-case ] [ \--extended-regexp ]
> + [ \--regexp-ignore-case | \-i ]
> + [ \--extended-regexp | \-E ]
> [ \--date={local|relative|default|iso|rfc|short} ]
> [ [\--objects | \--objects-edge] [ \--unpacked ] ]
> [ \--pretty | \--header ]
> @@ -227,11 +228,11 @@ limiting may be applied.
> Limit the commits output to ones with log message that
> matches the specified pattern (regular expression).
>
> ---regexp-ignore-case::
> +--regexp-ignore-case, -i::
>
> Match the regexp limiting patterns without regard to letters case.
>
> ---extended-regexp::
> +--extended-regexp, -E::
>
> Consider the limiting patterns to be extended regular expressions
> instead of the default basic regular expressions.
> diff --git a/revision.c b/revision.c
> index 7036cf2..00b75bc 100644
> --- a/revision.c
> +++ b/revision.c
> @@ -1165,11 +1165,13 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
> add_message_grep(revs, arg+7);
> continue;
> }
> - if (!prefixcmp(arg, "--extended-regexp")) {
> + if (!strcmp(arg, "--extended-regexp") ||
> + !strcmp(arg, "-E")) {
> regflags |= REG_EXTENDED;
> continue;
> }
> - if (!prefixcmp(arg, "--regexp-ignore-case")) {
> + if (!strcmp(arg, "--regexp-ignore-case") ||
> + !strcmp(arg, "-i")) {
> regflags |= REG_ICASE;
> continue;
> }
>
>
^ permalink raw reply
* Re: [PATCH 3/5] Internationalization of git-gui
From: Shawn O. Pearce @ 2007-07-22 7:47 UTC (permalink / raw)
To: Christian Stimming; +Cc: Brett Schwarz, git, Paul Mackerras
In-Reply-To: <200707211437.43524.stimming@tuhh.de>
Christian Stimming <stimming@tuhh.de> wrote:
> Subject: [PATCH] Initial German translation for testing of i18n.
...
> diff --git a/po/de.po b/po/de.po
> new file mode 100644
> index 0000000..0592836
> --- /dev/null
> +++ b/po/de.po
> @@ -0,0 +1,265 @@
> +# Translation of git-gui to German.
> +# Copyright (C) 2007 Linux Torvalds
I didn't realize Linus wrote German. ;-)
Or are you assigning the copyright to Linus, much as other chunks
of Git are copyrighted by Linus?
--
Shawn.
^ permalink raw reply
* Re: [PATCH 2/5] Internationalization of git-gui
From: Shawn O. Pearce @ 2007-07-22 7:45 UTC (permalink / raw)
To: Christian Stimming; +Cc: Brett Schwarz, git, Paul Mackerras
In-Reply-To: <200707211434.56622.stimming@tuhh.de>
Christian Stimming <stimming@tuhh.de> wrote:
> Subject: [PATCH] Mark strings for translation.
>
> The procedure [mc ...] will translate the strings through msgcat.
...
> Here I marked much more strings than in the previous patch, and as discussed
> the procedure [mc ...] is used for translation. Actually I think this pretty much
> caught all occurrences of user-visible strings in *this* file; there will be many
> more strings in all the other files, of course.
Almost. I noticed two that you did miss, and its because they are
totally weird. We may want to rewrite this block of code first...
> @@ -1673,7 +1673,7 @@ if {[is_enabled transport]} {
> menu .mbar.repository
>
> .mbar.repository add command \
> - -label {Browse Current Branch's Files} \
> + -label [mc "Browse Current Branch's Files"] \
> -command {browser::new $current_branch}
> trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Browse \$current_branch's Files\" ;#"
> .mbar.repository add command \
> @@ -1682,69 +1682,69 @@ trace add variable current_branch write ".mbar.repository entryconf [.mbar.repos
> .mbar.repository add separator
>
> .mbar.repository add command \
> - -label {Visualize Current Branch's History} \
> + -label [mc "Visualize Current Branch's History"] \
> -command {do_gitk $current_branch}
> trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Visualize \$current_branch's History\" ;#"
> .mbar.repository add command \
See those two trace lines? These things are setting up hooks to
change the menu item's label on the fly, so that the current branch
name is shown in the item label. These will also need to use mc to
translate the string. But they are in a double quoted string and will
be eval'd later by Tcl, so we actually need something like:
- trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Visualize \$current_branch's History\" ;#"
+ trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \[mc \"Visualize \$current_branch's History\"\] ;#"
These are (I think) the only two places in all of git-gui where
this wierdness happens. Converting this trace pair to a normal
procedure may make it easier to manage for translation.
> - .mbar.apple add command -label "About [appname]" \
> + .mbar.apple add command -label [mc "About %s" appname] \
Bug. This needs to be:
+ .mbar.apple add command -label [mc "About %s" [appname]] \
You lost one level of [] there when you did the replacement.
I only noticed this during a fast scan through while deleting text.
I'll have to reread this patch more carefully later, before I apply
(or merge) it, to make sure we don't have more such cases.
--
Shawn.
^ permalink raw reply
* Re: [PATCH 1/5] Internationalization of git-gui
From: Shawn O. Pearce @ 2007-07-22 7:38 UTC (permalink / raw)
To: Christian Stimming; +Cc: Brett Schwarz, git, Paul Mackerras
In-Reply-To: <200707211433.29318.stimming@tuhh.de>
Christian Stimming <stimming@tuhh.de> wrote:
> Subject: [PATCH] Initialize msgcat (gettext).
...
> diff --git a/git-gui.sh b/git-gui.sh
> index c5ff7c8..0c5ca46 100755
> --- a/git-gui.sh
> +++ b/git-gui.sh
> @@ -108,6 +108,12 @@ if {$idx ne {}} {
> }
> unset -nocomplain oguirel idx fd
>
> +## Internationalization (i18n) through msgcat and gettext. See
> +## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
> +package require msgcat
> +::msgcat::mcload [file join $oguilib msgs]
> +namespace import ::msgcat::mc
> +
Thanks. We'll probably also want to modify the lib/class.tcl to
import ::msgcat::mc into the class namespace when it creates it.
I use that class thing throught most of git-gui, especially for
UI code. About 50% of git-gui has been converted to use class,
the other 50% is just global and is still in git-gui.sh. ;-)
--
Shawn.
^ permalink raw reply
* Re: [PATCH] Initial Chinese translation
From: Shawn O. Pearce @ 2007-07-22 7:35 UTC (permalink / raw)
To: Junio C Hamano
Cc: Xudong Guan, git, Johannes Schindelin, Paolo Ciarrocchi,
しらいしななこ,
Christian Stimming
In-Reply-To: <7vhcnxtgvw.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano <gitster@pobox.com> wrote:
> Xudong Guan <xudong.guan@gmail.com> writes:
>
> > Simplified Chinese, in UTF-8 encoding.
> >
> > Signed-off-by: Xudong Guan <xudong.guan@gmail.com>
> > ---
> > po/zh.po | 250 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> > 1 files changed, 250 insertions(+), 0 deletions(-)
>
> This raises another point in the current i18n scheme. How would
> we allow zh_CN and zh_TW to coexist?
They probably should be po/zh_CN.po and po/zh_TW.po. Tcl msgcat
loads the file that best matches the user's local preferences, so
zh.po would be the fallback if neither zh_CN and zh_TW were present,
or if the user was using say zh_US as their preferred local.
--
Shawn.
^ permalink raw reply
* Re: executing git from a non git directory
From: Jeff King @ 2007-07-22 7:11 UTC (permalink / raw)
To: Patrick Aljord; +Cc: git
In-Reply-To: <6b6419750707212355q48a934e4n3be0d6111694ad01@mail.gmail.com>
On Sun, Jul 22, 2007 at 01:55:33AM -0500, Patrick Aljord wrote:
> $ git --git-dir=/path/to/my_git_dir status
>
> and
>
> $ GIT_DIR='/path/to/my_git_dir' && git status
>
> but in both cases I get this error:
> fatal: Not a git repository: '/path/to/my_git_dir'
A git dir is the location where all of the repository information is
stored; it is called '.git' for a directory with a working tree. Is
/path/to/my_git_dir really a git dir, or is it a working directory that
has a '.git' inside it?
If the latter, then you need to specify the .git directory. However,
running 'git-status' won't make any sense then, since you won't be in
the correct working tree (so of course it will look like files have been
removed).
You could do something like "git --dir /path/to/my_git_dir/.git branch"
and it would at least produce sensible results.
> yet when I do "$ cd /path/to/my_git_dir && git status" I do get the results.
Right. That's the way you have to do it in the case of 'status', since
you need your current working directory to be in the right place.
If you are running a very recent git, you can now try:
git --work-tree=/path/to/my_git_dir --git-dir=/path/to/my_git_dir/.git status
which is what you actually want.
-Peff
^ permalink raw reply
* Re: executing git from a non git directory
From: Shawn O. Pearce @ 2007-07-22 7:07 UTC (permalink / raw)
To: Patrick Aljord; +Cc: git
In-Reply-To: <6b6419750707212355q48a934e4n3be0d6111694ad01@mail.gmail.com>
Patrick Aljord <patcito@gmail.com> wrote:
> I would like to check it from another direcory, I tried the following
> command:
>
> $ git --git-dir=/path/to/my_git_dir status
>
> and
>
> $ GIT_DIR='/path/to/my_git_dir' && git status
These are actually the same two commands. The --git-dir option
just means "set GIT_DIR before calling the real command".
However, there are two problems here...
> but in both cases I get this error:
> fatal: Not a git repository: '/path/to/my_git_dir'
Right. That's problem number 1. /path/to/my_git_dir is probably
not actually your Git repository. The git repository is actually in
".git", so you really need to use:
$ git --git-dir=/path/to/my_git_dir/.git status
However, problem number 2 is that status requires a working
directory. Setting GIT_DIR explicitly like this tells git that
you don't have a working directory present. So status won't work.
> yet when I do "$ cd /path/to/my_git_dir && git status" I do get the results.
That's what you have to do if you want to run git-status. Or use
a subshell as that won't change your current working directory:
$ (cd /path/to/my_git_dir && git status)
--
Shawn.
^ permalink raw reply
* executing git from a non git directory
From: Patrick Aljord @ 2007-07-22 6:55 UTC (permalink / raw)
To: git
Hey all,
I have my git directory that is in /path/to/my_git_dir
I would like to check it from another direcory, I tried the following command:
$ git --git-dir=/path/to/my_git_dir status
and
$ GIT_DIR='/path/to/my_git_dir' && git status
but in both cases I get this error:
fatal: Not a git repository: '/path/to/my_git_dir'
yet when I do "$ cd /path/to/my_git_dir && git status" I do get the results.
Any idea what I'm doing wrong or if there's a way to check a git dir
from a non git dir?
thanx in advance
Pat
^ permalink raw reply
* Re: [RFC PATCH] Re: Empty directories...
From: david @ 2007-07-22 6:38 UTC (permalink / raw)
To: David Kastrup; +Cc: Linus Torvalds, git
In-Reply-To: <85abtpoydg.fsf@lola.goethe.zz>
On Sun, 22 Jul 2007, David Kastrup wrote:
> Linus Torvalds <torvalds@linux-foundation.org> writes:
>
>> On Sun, 22 Jul 2007, David Kastrup wrote:
>>>
>>> "." _is_ visible and detectable in every tree.
>>
>> I'm going to add you to my "clueless" filter, because it's not worth
>> my time to answr you any more.
>
> Too bad I can't do the same.
>
>> I told you. Several times. That "." is pointless exactly because
>> it's in _every_ tree, and as such is no longer "content".
>
> "." is in every _non-empty_ directory tree. But we are talking about
> permitting _empty_ trees in the repository. And for an empty tree in
> the repository, "." may or may not be in the corresponding work
> directory tree, depending on whether the directory exists or not. So
> when we are talking about a repository tree _becoming_ empty, we need
> the information whether or whether not we should remove it upon
> becoming empty. _That_ is the information content of "." being or not
> being considered part of the trackable material. And the information
> is no longer available at the time the repository tree becomes empty
> _unless_ we already store it there when the tree is still populated.
David, the point where you and Linus are talking past each other is that
Linus is assuming that you only want to track some specific directories,
and for that tracking "." doesn't work becouse it's in every directory
you apparently consider every directory equal and therefor the fact that
"." exists in every directory doesn't bother you becouse you want to track
every directory.
what you are not hearing is that while Linus and the other git developers
can see reasons to track directories sometimes, they definantly don't
agree that you want to track directories all the time.
sometimes the fact that a directory exists is significant, most of the
time it's not. and the difference between what is and what isn't
significant isn't a per-repository or per-project thing, it's a
per-directory thing.
in one repository you will have some directories that only exist becouse
files are in them, and you may have some directories that exist becouse
you explicitly want them to exist.
both types have the "." file in them (or appear to, some OS's/filesystems
don't actually have a "." on disk, they add it when needed when reporting
to userspace), so git has no way to tell which ones you explicitly want
tracked.
creating .gitignore in the directories that you want tracked lets the
other directories not be trackes.
David Lang
>> It's not something that the user can care about, because it has no
>> meaning. There's no point in tracking it, because even if we do
>> *not* track it, it's there, and we cannot do anything about it.
>
> Ok, here we go _again_. Test case 1:
>
> mkdir a
> touch a/b
> git-add a/b
> git-commit -m x
> git-rm a/b
> git-commit -m x
>
> Now we want to have the directory a _removed_.
>
> Test case 2:
>
> mkdir a
> touch a/b
> git-add a
> git-commit -m x
> git-rm a/b
> git-commit -m x
>
> Now we want to have the directory a _retained_.
>
> After the first commit in _both_ test cases, the only file in the
> trees / and /a is a/b. The working directory state is _identical_ at
> this point, and we do identical commands afterwards.
>
> The end result is not identical, so there must be some information
> different in the repository after the first commit. This information
> _can't_ be encoded in a remaining empty tree, because both the trees /
> and /a are _non_-empty yet.
>
> So we _must_ encode the evaporate-or-not-when-empty information
> _otherwise_ into the repository. And we do that by _not_ having
> /a/. in the set of tracked files in test case 1, and by _having_ it in
> the set of tracked files in test case 2.
>
>> That was the whole difference between "." and ".gitignore", and I
>> explicitly pointed out that that was the difference (and the _only_
>> one), and why it mattered.
>
> You are underestimating the power of ".gitignore": while it is true
> that its _physical_ presence will reliably keep git from removing the
> directory, its physical presence is not _actually_ required.
>
> It is sufficient that git _believes_ in its continuing physical
> existence. And if we tell it "it is still there" whenever it takes a
> look, then git will keep the record of .gitignore in its tree, and
> consequently won't remove the tree and not try deleting the directory.
> However, once we explicitly tell it "remove the record of .gitignore
> from the repository", it will do so, and in the course of doing so
> remove the directory in the work directory together with the tree in
> the repository.
>
> From a user interface and logical standpoint, adding or not adding "."
> to the tracked content is a perfectly consistent and convenient way of
> having the directory kept around or not.
>
> From the viewpoint of the internal data structures, I'll likely go
> with tampering with (pseudo-)permissions.
>
>> And you didn't listen. And now you claim that I don't read your
>> emails. I do. They just don't make any sense.
>>
>> Consider this discussion ended. I simply don't care any more.
>
> It is painfully clear that I could invest a few weeks of time in
> coding better than in explaining stuff. And I guess that's what I'll
> have to do. And afterwards it will be your job to wrack your head
> about why something does all the right things for the wrong reasons
> and come up with a different explanation how and why the code works.
>
>
^ permalink raw reply
* Re: [PATCH] Added 'git-rev-list --igrep' option for case insensitive grep
From: Junio C Hamano @ 2007-07-22 6:17 UTC (permalink / raw)
To: Dmitry Kakurin; +Cc: git
In-Reply-To: <7v8x99t25s.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano <gitster@pobox.com> writes:
> Are there notable side effects you would need to warn users
> about?
>
> For example, what is the difference between "--igrep=foo
> --author=bar" and "--grep=foo --author=bar"?
Nah, let's not try to be too subtle. It does not work.
What I am wondering is if there is an unintended option name
conflict if we simply accept "-i" and "-E" as synonyms to
"--regexp-ignore-case" and "--extended-regexp". The option
parser for log family in revision.c is used from many places,
so it is a bit hard to verify everobody to be absolutely sure,
but I do not think of any offhand. There indeed are commands
that take "-i" to mean something other than ignore-case, but
ignore-case would not be meaningful for their operation.
So I would rather prefer this replacement patch.
-- >8 --
Synonyms: -i == --regexp-ignore-case, -E == --extended-regexp
These options to log family were too long to type. Give them
shorter synonyms.
Fix the parsing of the long options while at it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/git-rev-list.txt | 7 ++++---
revision.c | 6 ++++--
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index 08e7573..f9fadaf 100644
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -27,7 +27,8 @@ SYNOPSIS
[ \--cherry-pick ]
[ \--encoding[=<encoding>] ]
[ \--(author|committer|grep)=<pattern> ]
- [ \--regexp-ignore-case ] [ \--extended-regexp ]
+ [ \--regexp-ignore-case | \-i ]
+ [ \--extended-regexp | \-E ]
[ \--date={local|relative|default|iso|rfc|short} ]
[ [\--objects | \--objects-edge] [ \--unpacked ] ]
[ \--pretty | \--header ]
@@ -227,11 +228,11 @@ limiting may be applied.
Limit the commits output to ones with log message that
matches the specified pattern (regular expression).
---regexp-ignore-case::
+--regexp-ignore-case, -i::
Match the regexp limiting patterns without regard to letters case.
---extended-regexp::
+--extended-regexp, -E::
Consider the limiting patterns to be extended regular expressions
instead of the default basic regular expressions.
diff --git a/revision.c b/revision.c
index 7036cf2..00b75bc 100644
--- a/revision.c
+++ b/revision.c
@@ -1165,11 +1165,13 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
add_message_grep(revs, arg+7);
continue;
}
- if (!prefixcmp(arg, "--extended-regexp")) {
+ if (!strcmp(arg, "--extended-regexp") ||
+ !strcmp(arg, "-E")) {
regflags |= REG_EXTENDED;
continue;
}
- if (!prefixcmp(arg, "--regexp-ignore-case")) {
+ if (!strcmp(arg, "--regexp-ignore-case") ||
+ !strcmp(arg, "-i")) {
regflags |= REG_ICASE;
continue;
}
^ permalink raw reply related
* Re: [PATCH] Documentation/gitignore.txt: Fix the seriously misleading priority explanation
From: Junio C Hamano @ 2007-07-22 6:04 UTC (permalink / raw)
To: David Kastrup; +Cc: git
In-Reply-To: <85wswtp8va.fsf@lola.goethe.zz>
Your rewrite makes "patterns found in deeper file overrides the
ones in shallower ones" rule much much easier to read. Thanks.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox