Re: german translation bug

2013-12-26 Thread Jiang Xin
-- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[GIT PULL] l10n update for maint branch

2014-01-05 Thread Jiang Xin
be merged without conflicts. -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [Bug report] 'git status' always says Your branch is up-to-date with 'origin/master'

2014-01-05 Thread Jiang Xin
of .* by 2 commits actual ' } -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: Re: [Bug report] 'git status' always says Your branch is up-to-date with 'origin/master'

2014-01-06 Thread Jiang Xin
/master' which is obviously wrong. -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Want to do some cleanups in this round of l10n

2014-01-17 Thread Jiang Xin
: 2194 translated messages. zh_CN.po : 2194 translated messages. Any suggestions? 2014/1/18 Jiang Xin worldhello@gmail.com: Hi All, Since Git v1.9-rc0 had already been released, it's time to start new round of git l10n. This time there are 27 new messages need to be translated

Re: Want to do some cleanups in this round of l10n

2014-01-18 Thread Jiang Xin
translations latter... Remove them can make the Git package smaller and give opportunities to other contributors. -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org

Re: [PATCH] l10n: de.po: translate 27 new messages

2014-01-24 Thread Jiang Xin
ending colons, some have and some not. -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[GIT PULL] l10n updates for 1.9 round 1

2014-01-31 Thread Jiang Xin
) Alexander Shopov (2): po/TEAMS: Added Bulgarian team l10n: Bulgarian translation of git (222t21f1967u) Jean-Noel Avila (1): [fr] update french translation 2210/2210 Jiang Xin (4): l10n: git.pot: v1.9 round 1 (27 new

[GIT PULL] l10n updates for 1.9.0 round 2

2014-02-07 Thread Jiang Xin
) Jean-Noel Avila (1): l10n: fr: 1.9rc2 2211t Jiang Xin (5): l10n: git.pot: v1.9 round 2 (1 new) Merge branch 'master' of git://github.com/vnwildman/git Merge branch 'master' of git://github.com/nafmo/git-l10n-sv l10n

Re: [GIT PULL] l10n updates for 1.9.0 round 2

2014-02-11 Thread Jiang Xin
messages l10n: de.po: correct message when hiding commits by craft po/de.po | 1810 +- 1 file changed, 966 insertions(+), 844 deletions(-) -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body

Re: [PATCH v2 1/2] i18n: proposed command missing leading dash

2014-03-05 Thread Jiang Xin
-po, and can be merged to master directly. -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH 3/6] l10n: Fix misuses of nor

2014-03-16 Thread Jiang Xin
, such as builtin/clean.c. -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [l10n] date: Note for translators not included in .po files

2014-04-16 Thread Jiang Xin
). According to po/README, the l10n coordinator is responsible for updating the git.pot file. Would it be possible to update it based on v1.9.2 and include the above comment? I could generate a new git.pot for maint branch, but fixes for codes may only contribute to master branch. -- Jiang Xin

[PATCH 0/3] extract proper comments for l10n translators

2014-04-16 Thread Jiang Xin
When generate git.pot, many irrelevant comments are extracted as references for translators, but one useful comment is lost. This series patches will fix this issue. Jiang Xin (3): i18n: Fixes uncatchable comments for translators i18n: Only extract comments marked by special tag i18n

[PATCH 1/3] i18n: Fixes uncatchable comments for translators

2014-04-16 Thread Jiang Xin
Comment for l10n translators can not be extracted by xgettext if it is not right above the l10n tag. Moving the comment right before the l10n tag will fix this issue. Reported-by: Brian Gesiak modoca...@gmail.com Signed-off-by: Jiang Xin worldhello@gmail.com --- date.c | 2 +- 1 file

[PATCH 3/3] i18n: Remove obsolete comments for translators

2014-04-16 Thread Jiang Xin
Since we do not translate diffstat any more, remove the obsolete comments. Signed-off-by: Jiang Xin worldhello@gmail.com --- diff.c | 8 1 file changed, 8 deletions(-) diff --git a/diff.c b/diff.c index 539997f..54d5308 100644 --- a/diff.c +++ b/diff.c @@ -1461,20 +1461,12 @@ int

[PATCH 2/3] i18n: Only extract comments marked by special tag

2014-04-16 Thread Jiang Xin
tag, not * TRANSLATORS: (which has a star before the tag). Signed-off-by: Jiang Xin worldhello@gmail.com --- Makefile | 2 +- builtin/init-db.c | 8 +++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 2128ce3..a53f3a8 100644 --- a/Makefile

Re: [PATCH 0/3] extract proper comments for l10n translators

2014-04-16 Thread Jiang Xin
2014-04-17 13:37 GMT+08:00 Jiang Xin worldhello@gmail.com: When generate git.pot, many irrelevant comments are extracted as references for translators, but one useful comment is lost. This series patches will fix this issue. Brief changes of po/git.pot after applied these patches: diff

Re: [l10n] date: Note for translators not included in .po files

2014-04-17 Thread Jiang Xin
2014-04-17 6:51 GMT+08:00 Brian Gesiak modoca...@gmail.com: According to po/README, the l10n coordinator is responsible for updating the git.pot file. Would it be possible to update it based on v1.9.2 and include the above comment? I have pushed a polished git.pot to the maint branch of

Re: [PATCH 2/3] i18n: Only extract comments marked by special tag

2014-04-18 Thread Jiang Xin
2014-04-18 2:08 GMT+08:00 Junio C Hamano gits...@pobox.com: Jiang Xin worldhello@gmail.com writes: When extract l10n messages, we use --add-comments option to keep comments right above the l10n messages for references. But sometimes irrelevant comments are also extracted. For example

[PATCH] blame: add correct paddings in time_buf for align

2014-04-18 Thread Jiang Xin
of strlen() for calibration. Signed-off-by: Jiang Xin worldhello@gmail.com --- Before applying this patch: 5817da01 builtin-blame.c (Pierre Habouzit 6 年前 21) #include parse-options.h ffaf9cc0 builtin-blame.c (Geoffrey Thomas

[L10N] Startup of Git 2.0.0 l10n round 1

2014-04-19 Thread Jiang Xin
l10n round 1. Signed-off-by: Jiang Xin worldhello@gmail.com You can get it from the usual place: https://github.com/git-l10n/git-po/ As how to update your XX.po and help to translate Git, please see Updating a XX.po file and other sections in “po/README file. -- Jiang Xin

[PATCH v2 0/2] peroper align of datetime filed of git-blame

2014-04-20 Thread Jiang Xin
When rewrite time_buf[128] to strbuf, find another bug from the original implement. See detail commit log of 1/2. Jiang Xin (2): bugfix: fix broken time_buf paddings for git-blame blame: use different blame_date_width for different locale builtin/blame.c | 29

[PATCH v2 2/2] blame: use different blame_date_width for different locale

2014-04-20 Thread Jiang Xin
, it maybe smaller. E.g. For Chinese locale, only needs 16-character width. Set blame_date_width as the display width of _(4 years, 11 months ago), so that translators can make the choice. Signed-off-by: Jiang Xin worldhello@gmail.com --- builtin/blame.c | 10 +- 1 file changed, 9

[PATCH v2 1/2] bugfix: fix broken time_buf paddings for git-blame

2014-04-20 Thread Jiang Xin
the time_buf padding with spaces should have a constant display width, not a fixed strlen size. So we should call utf8_strwidth() instead of strlen() for calibration. Signed-off-by: Jiang Xin worldhello@gmail.com --- builtin/blame.c | 19 ++- 1 file changed, 14 insertions

[PATCH v3 2/2] blame: use a helper to get suitable blame_date_width

2014-04-21 Thread Jiang Xin
, it maybe smaller. E.g. For Chinese locale, only needs a half (16-character width). Add a helper function date_relative_maxwidth() to date.c, which returns the suitable display width for the relative date field in different locale. Suggested-by: Junio C Hamano gits...@pobox.com Signed-off-by: Jiang

[PATCH v3 1/2] bugfix: fix broken time_buf paddings for git-blame

2014-04-21 Thread Jiang Xin
-by: Eric Sunshine sunsh...@sunshineco.com Signed-off-by: Jiang Xin worldhello@gmail.com --- builtin/blame.c | 21 ++--- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/builtin/blame.c b/builtin/blame.c index 88cb799..35e95db 100644 --- a/builtin/blame.c +++ b/builtin

[PATCH v3 0/2] peroper align of datetime filed of git-blame

2014-04-21 Thread Jiang Xin
Changes since v2: * Fixed typos in commit log 1/2. Thanks, Eric. * With the help of Junio, write a helper to get suitable blame_date_width. Jiang Xin (2): bugfix: fix broken time_buf paddings for git-blame blame: use a helper to get suitable blame_date_width builtin/blame.c | 85

Re: [PATCH v2 2/2] blame: use different blame_date_width for different locale

2014-04-22 Thread Jiang Xin
) / 60; 106 if (diff 90) { 107 strbuf_addf(timebuf, 108 Q_(%lu minute ago, %lu minutes ago, diff), diff); 109 return; 110 } -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git

Re: [PATCH v3 2/2] blame: use a helper to get suitable blame_date_width

2014-04-22 Thread Jiang Xin
to this thread: * http://thread.gmane.org/gmane.comp.version-control.git/246464 -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH v4 0/2] peroper align of datetime filed of git-blame

2014-04-22 Thread Jiang Xin
Changes since V3: * rollback patch 2/2 to v2, but with a nicer comment for translators. Jiang Xin (2): bugfix: fix broken time_buf paddings for git-blame blame: dynamic blame_date_width for different locales builtin/blame.c | 30 ++ 1 file changed, 22

[PATCH v4 1/2] bugfix: fix broken time_buf paddings for git-blame

2014-04-22 Thread Jiang Xin
-by: Eric Sunshine sunsh...@sunshineco.com Signed-off-by: Jiang Xin worldhello@gmail.com --- builtin/blame.c | 21 ++--- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/builtin/blame.c b/builtin/blame.c index 88cb799..35e95db 100644 --- a/builtin/blame.c +++ b/builtin

[PATCH v4 2/2] blame: dynamic blame_date_width for different locales

2014-04-22 Thread Jiang Xin
, it maybe smaller. E.g. For Chinese locale, only needs a half (16-character width). Set blame_date_width as the display width of _(4 years, 11 months ago), so that translators can make the choice. Helped-by: Junio C Hamano gits...@pobox.com Signed-off-by: Jiang Xin worldhello@gmail.com

Re: What's cooking in git.git (Apr 2014, #07; Tue, 22)

2014-04-22 Thread Jiang Xin
localized timestamps, resulting in jaggy left-side-edge of the source code lines in its output. Will merge to 'next' and keep it there for the remainder of the cycle. -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

[GIT PULL] l10n updates for 2.0.0 round 1

2014-04-29 Thread Jiang Xin
: improve hint for autocorrected command execution (2014-04-29 06:12:31 +0200) Jean-Noel Avila (1): l10n: fr translation for v2.0.0rc0 (2228t) Jiang Xin (3): l10n: git.pot: v2.0.0 round 1 (45 new, 28 removed) Merge

[GIT PULL] l10n update on Swedish

2014-05-07 Thread Jiang Xin
(-) -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[GIT PULL] over 1000+ translations on Bulgarian for you to pull

2014-05-11 Thread Jiang Xin
++ 1 file changed, 2755 insertions(+), 2278 deletions(-) -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: Delaying 2.0 final

2014-05-17 Thread Jiang Xin
po/fr.po | 42 +- 1 file changed, 21 insertions(+), 21 deletions(-) -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo

Re: Delaying 2.0 final

2014-05-17 Thread Jiang Xin
2014-05-18 8:31 GMT+08:00 Jiang Xin worldhello@gmail.com: 2014-05-17 6:45 GMT+08:00 Junio C Hamano gits...@pobox.com: As we seem to have a few regressions we may want to fix, I will not be cutting the 2.0 final today (https://tinyurl.com/gitCal). I queued the following near the bottom

[GIT PULL] l10n updates for 2.1.0 round 1

2014-08-16 Thread Jiang Xin
(2257t,0f,0u) Jean-Noel Avila (1): l10n: fr.po (2257t) update for version 2.1.0 Jiang Xin (6): l10n: git.pot: v2.1.0 round 1 (38 new, 9 removed) Merge remote-tracking branch 'sv/nafmo/master' Merge commit 'bg/alshopov/master' l10n: zh_CN: translations for git v2.1.0

Re: [PATCH 1/2] Makefile: use find to determine static header dependencies

2014-08-23 Thread Jiang Xin
instead of explicitly keeping track of dependencies. That's great, it's better than what I used to execute: rm po/git.pot; make pot -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http

Re: [PATCH] l10n: de.po: translate 38 new messages

2014-08-23 Thread Jiang Xin
file changed, 62 insertions(+), 69 deletions(-) -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[GIT PULL] l10n updates for Git 2.1.1

2014-08-29 Thread Jiang Xin
po/TEAMS: add new members to German translation team po/TEAMS |2 + po/de.po | 2872 +- 2 files changed, 1515 insertions(+), 1359 deletions(-) -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git

[GIT PULL] some updates from German l10n team

2014-09-27 Thread Jiang Xin
Hi Junio, Please pull German l10n updates to the maint branch, and merge them back to the master branch later. The following changes since commit 96db324a73fdada6fbe7b63221986f8f18cc63b0: Merge git://github.com/git-l10n/git-po (2014-08-29 10:18:22 -0700) are available in the git repository

[L10N] Startup of Git 2.2.0 l10n round 1

2014-10-31 Thread Jiang Xin
l10n round 1. Signed-off-by: Jiang Xin worldhello@gmail.com You can get it from the usual place: https://github.com/git-l10n/git-po/ As how to update your XX.po and help to translate Git, please see Updating a XX.po file and other sections in “po/README file. -- Jiang Xin

Re: [L10N] Startup of Git 2.2.0 l10n round 1

2014-11-02 Thread Jiang Xin
send a patch to the list if you like. @alshopov Thanks, Christian. -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[GIT PULL] l10n updates for 2.2.0 round 1

2014-11-09 Thread Jiang Xin
): l10n: fr.po (2296t) update for version 2.2.0 Jiang Xin (4): l10n: git.pot: v2.2.0 round 1 (62 new, 23 removed) Merge branch 'master' of git://github.com/nafmo/git-l10n-sv Merge branch 'fr_2.2.0' of git://github.com/jnavila/git l10n: zh_CN: translations for git v2.2.0

[PATCH] Documentation/git-clean: fix description for range

2013-07-23 Thread Jiang Xin
The descriptions of select by numbers section for interactive git-clean are borrowed from git-add, and one sentence should be replaced. Signed-off-by: Jiang Xin worldhello@gmail.com --- Documentation/git-clean.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[PATCH] git-clean: implement partial matching for selection

2013-07-23 Thread Jiang Xin
Document for interactive git-clean says: You also could say `c` or `clean` above as long as the choice is unique. But it's not true, because only hotkey `c` and full match (`clean`) could work. Implement partial matching via find_unique function to make the document right. Signed-off-by: Jiang

[PATCH v2] git-clean: implement partial matching for selection

2013-07-23 Thread Jiang Xin
In the 1st version of this patch, I forgot to remove a shell command for debug in t7301: find . /tmp/x Remove the above command in this version. Sorry about this. Jiang Xin (1): git-clean: implement partial matching for selection builtin/clean.c | 80

[PATCH v2] git-clean: implement partial matching for selection

2013-07-23 Thread Jiang Xin
Document for interactive git-clean says: You also could say `c` or `clean` above as long as the choice is unique. But it's not true, because only hotkey `c` and full match (`clean`) could work. Implement partial matching via find_unique function to make the document right. Signed-off-by: Jiang

redundant message in builtin/rm.c

2013-07-25 Thread Jiang Xin
submodule)\nuse a .git directory:, ( nested submodule should be nested submodules ?) -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info

Fwd: Kick off for Git 1.8.4 l10n round 1

2013-07-26 Thread Jiang Xin
new, 46 removed) Generate po/git.pot from v1.8.4-rc0 for git v1.8.4 l10n round 1. Signed-off-by: Jiang Xin worldhello@gmail.com You can get it from the usual place: https://github.com/git-l10n/git-po/ As how to update your XX.po and help to translate Git, please see Updating

Re: [BUG] git_path() returns relative paths

2013-07-27 Thread Jiang Xin
1 file changed, 27 insertions(+) How to fix this bug, I have no idea now. -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Please pull l10n updates for 1.8.4 round 1

2013-08-03 Thread Jiang Xin
to 2e8451e8602380a8a129f21da6364f3ea879e6a9: l10n: zh_CN.po: translate 99 messages (2133t0f0u) (2013-08-03 14:14:07 +0800) Jiang Xin (2): l10n: git.pot: v1.8.4 round 1 (99 new, 46 removed) l10n: zh_CN.po: translate 99 messages (2133t0f0u) Tran

Re: Please pull l10n updates for 1.8.4 round 1

2013-08-03 Thread Jiang Xin
2013/8/3 Trần Ngọc Quân vnwild...@gmail.com: On 03/08/2013 13:39, Jiang Xin wrote: Hi, Junio Please pull these updates for git l10n. BTW, Ralf's updates for de.po are still in the review process in this list, but I want to send this pull request earlier, because I find there are some

Re: Please pull l10n updates for 1.8.4 round 1

2013-08-03 Thread Jiang Xin
2013/8/3 Jiang Xin worldhello@gmail.com: are available in the git repository at: git://github.com/gotgit/git-po git://github.com/git-l10n/git-po Thanks Trần. Should be git-l10n/got-po, and gotgit/git-po does not exist. In order to prevent this, next time when I generate this pull

[RFC] status: show tracking branch even no difference

2013-08-07 Thread Jiang Xin
: 'origin/master'. # ... $ git status -bs ## master...origin/master ... $ git checkout master Already on 'master' Your branch is identical to its tracking branch: 'origin/master'. [1]: http://thread.gmane.org/gmane.comp.version-control.git/198703 Signed-off-by: Jiang

Re: [RFC] status: show tracking branch even no difference

2013-08-07 Thread Jiang Xin
2013/8/7 Matthieu Moy matthieu@grenoble-inp.fr: Jiang Xin worldhello@gmail.com writes: With this patch, git status will report relationship between current branch and its upstream counterpart even if there is no difference. $ git status # On branch master # Your branch

[PATCH v2] status: always show tracking branch even no change

2013-08-07 Thread Jiang Xin
to 'origin/master'. # ... $ git status -bs ## master...origin/master ... $ git checkout master Already on 'master' Your branch is identical to 'origin/master'. [1]: http://thread.gmane.org/gmane.comp.version-control.git/198703 Signed-off-by: Jiang Xin worldhello

[PATCH v3] status: always show tracking branch even no change

2013-08-08 Thread Jiang Xin
in builtin/branch.c, and make it simpler. Jiang Xin (1): status: always show tracking branch even no change builtin/branch.c | 18 +--- remote.c | 18 +++- t/t6040-tracking-info.sh | 54 wt-status.c

[PATCH v3] status: always show tracking branch even no change

2013-08-08 Thread Jiang Xin
the current branch and its remote tracking branch point to the same commit, will return 1, instead of 0. Because we want to report the tracking info for such case. Also add some test cases in t6040. [1]: http://thread.gmane.org/gmane.comp.version-control.git/198703 Signed-off-by: Jiang Xin worldhello

Please pull l10n updates for 1.8.4 round 2

2013-08-09 Thread Jiang Xin
to 4402f301555feeada2de68c4576aa15acfe40b46: l10n: de.po: translate 5 messages (2013-08-09 06:53:44 +0200) Jiang Xin (2): l10n: git.pot: v1.8.4 round 2 (5 new, 3 removed) l10n: zh_CN.po: translate 5 messages (2135t0f0u) Peter Krefting (1

Fwd: [git-po] [fr] first commits for French localization (#62)

2013-08-09 Thread Jiang Xin
) Patch Links: https://github.com/git-l10n/git-po/pull/62.patch https://github.com/git-l10n/git-po/pull/62.diff -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo

Re: [PATCH v3] status: always show tracking branch even no change

2013-08-10 Thread Jiang Xin
2013/8/10 Junio C Hamano gits...@pobox.com: Jiang Xin worldhello@gmail.com writes: So always show the remote tracking branch in the output of git status and other commands will help users to see where the current branch will push to and pull from. E.g. ... Hmmph. I do not know

Re: [git-po] [fr] first commits for French localization (#62)

2013-08-12 Thread Jiang Xin
) Jean-Noel Avila (2): l10n: fr.po: 821/2112 messages translated l10n: Add reference for french translation team po/TEAMS |4 + po/fr.po | 9668 ++ 2 files changed, 9672 insertions(+) create mode 100644 po/fr.po -- Jiang

Re: [PATCH v3] status: always show tracking branch even no change

2013-08-12 Thread Jiang Xin
2013/8/12 Junio C Hamano gits...@pobox.com: Jiang Xin worldhello@gmail.com writes: 2013/8/10 Junio C Hamano gits...@pobox.com: Jiang Xin worldhello@gmail.com writes: So always show the remote tracking branch in the output of git status and other commands will help users to see where

[PATCH v5 2/2] status: always show tracking branch even no change

2013-08-12 Thread Jiang Xin
## feature1...github/feature1 ... $ git checkout feature1 Already on 'feature1' Your branch is identical to 'github/feature1'. ... Also add some test cases in t6040. Signed-off-by: Jiang Xin worldhello@gmail.com --- remote.c | 10 - t/t6040-tracking

[PATCH v5 1/2] branch: not report invalid tracking branch

2013-08-12 Thread Jiang Xin
and num_ours are both 0. Signed-off-by: Jiang Xin worldhello@gmail.com --- builtin/branch.c | 18 +- remote.c | 24 wt-status.c | 13 +++-- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c

Re: [PATCH v5 1/2] branch: not report invalid tracking branch

2013-08-14 Thread Jiang Xin
*sb) { int num_ours, num_theirs; To make it clear, I should change the variables name to ours and theirs just like function fill_tracking_info() in builtin/branch.c. -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

[PATCH v6 1/3] branch: not report invalid tracking branch

2013-08-15 Thread Jiang Xin
and num_ours are both 0. Signed-off-by: Jiang Xin worldhello@gmail.com --- builtin/branch.c | 24 remote.c | 43 ++- t/t6040-tracking-info.sh | 8 ++-- wt-status.c | 13 +++-- 4 files

[PATCH v6 3/3] status: always show tracking branch even no change

2013-08-15 Thread Jiang Xin
## feature1...github/feature1 ... $ git checkout feature1 Already on 'feature1' Your branch is identical to 'github/feature1'. ... Also add some test cases in t6040. Signed-off-by: Jiang Xin worldhello@gmail.com --- remote.c | 7 --- t/t6040-tracking

[PATCH v6 2/3] branch: report invalid tracking branch as broken

2013-08-15 Thread Jiang Xin
(with gone base), 0 (no base), and 1 (with base). [1]: http://thread.gmane.org/gmane.comp.version-control.git/231830/focus=232288 Suggested-by: Junio C Hamano gits...@pobox.com Signed-off-by: Jiang Xin worldhello@gmail.com --- builtin/branch.c | 17 +++-- remote.c

[PATCH v7 1/3] branch: not report invalid tracking branch

2013-08-15 Thread Jiang Xin
and num_ours are both 0. Signed-off-by: Jiang Xin worldhello@gmail.com --- builtin/branch.c | 24 remote.c | 43 ++- t/t6040-tracking-info.sh | 8 ++-- wt-status.c | 13 +++-- 4 files

[PATCH v7 3/3] status: always show tracking branch even no change

2013-08-15 Thread Jiang Xin
is identical to 'github/feature1'. ... $ git status -bs ## feature1...github/feature1 ... $ git checkout feature1 Already on 'feature1' Your branch is identical to 'github/feature1'. ... Also add some test cases in t6040. Signed-off-by: Jiang Xin worldhello

[PATCH v7 0/3] some enhancements for reporting branch tracking info

2013-08-15 Thread Jiang Xin
Changes since v6: * s/broken/gone/ in [PATCH 2/3] (branch: mark missing tracking branch as gone) * rewrite commit log for [PATCH 3/3] (status: always show tracking branch even no change) Jiang Xin (3): branch: not report invalid tracking branch branch: mark missing tracking branch

[PATCH v7 2/3] branch: mark missing tracking branch as gone

2013-08-15 Thread Jiang Xin
(with gone base), 0 (no base), and 1 (with base). [1]: http://thread.gmane.org/gmane.comp.version-control.git/231830/focus=232288 Suggested-by: Junio C Hamano gits...@pobox.com Signed-off-by: Jiang Xin worldhello@gmail.com --- builtin/branch.c | 18 -- remote.c

Re: [PATCH v7 0/3] some enhancements for reporting branch tracking info

2013-08-18 Thread Jiang Xin
remotes for my repo. show only the last one as 'not having any uptream', or something. I think keep silence in this case is better. -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http

Re: [PATCH v7 2/3] branch: mark missing tracking branch as gone

2013-08-21 Thread Jiang Xin
2013/8/21 Matthieu Moy matthieu@grenoble-inp.fr: Jiang Xin worldhello@gmail.com writes: $ git status # On branch topic # Your branch is based on 'topicbase', but the upstream is gone. # (use git branch --unset-upstream to fixup) Sorry, I didn't follow closely

[PATCH v8 1/2] branch: report invalid tracking branch as gone

2013-08-26 Thread Jiang Xin
if num_theirs and num_ours are both 0. [1]: http://thread.gmane.org/gmane.comp.version-control.git/231830/focus=232288 Suggested-by: Junio C Hamano gits...@pobox.com Signed-off-by: Jiang Xin worldhello@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- builtin/branch.c | 36

[PATCH v8 0/2] some enhancements for reporting branch tracking info

2013-08-26 Thread Jiang Xin
Changes since v7: * Squashed patch 1/3 and patch 2/3 into one big patch. But not s/gone/absent/ as Matthieu suggested. Jiang Xin (2): branch: report invalid tracking branch as gone status: always show tracking branch even no change builtin/branch.c | 36

[PATCH v8 2/2] status: always show tracking branch even no change

2013-08-26 Thread Jiang Xin
is identical to 'github/feature1'. ... $ git status -bs ## feature1...github/feature1 ... $ git checkout feature1 Already on 'feature1' Your branch is identical to 'github/feature1'. ... Also add some test cases in t6040. Signed-off-by: Jiang Xin worldhello

Re: [PATCH v8 2/2] status: always show tracking branch even no change

2013-08-26 Thread Jiang Xin
. Now I realize I should: s/identical to/up to date with/ -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH] documentation: clarify notes for clean.requireForce

2013-08-27 Thread Jiang Xin
Add -i (interactive clean option) to clarify the documentation for clean.requireForce config variable. Also replace the example in `gitcli.txt` with safer git clean command. Signed-off-by: Jiang Xin worldhello@gmail.com --- Documentation/config.txt | 4 ++-- Documentation/gitcli.txt | 2

[PATCH v2] documentation: clarify notes for clean.requireForce

2013-08-27 Thread Jiang Xin
Add -i (interactive clean option) to clarify the documentation for clean.requireForce config variable. Signed-off-by: Jiang Xin worldhello@gmail.com --- Documentation/config.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/config.txt b/Documentation

[GIT PULL] hotfix on fr.po for the maint branch

2013-08-30 Thread Jiang Xin
++ 2 files changed, 874 insertions(+), 718 deletions(-) -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: What's cooking in git.git (Sep 2013, #01; Tue, 3)

2013-09-05 Thread Jiang Xin
. # (use git branch --unset-upstream to fixup) ... $ git status # On branch feature1 # Your branch is up-to-date with 'github/feature1'. ... -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

Re: Regression in e02ca72: git svn rebase is broken on Windows

2013-09-10 Thread Jiang Xin
: Jiang Xin Date: Tue Jun 25 23:53:43 2013 +0800 path.c: refactor relative_path(), not only strip prefix Thanks, --Tvangeste The suspect commit and symptom look consistent. You started from a directory whose absolute path is w:/work/... and the updated code mistakenly thoguht

Re: Regression in e02ca72: git svn rebase is broken on Windows

2013-09-10 Thread Jiang Xin
have_same_root does not cover this case, so using a simple_relative_path function instead of relative_path in setup.c may be the better. -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http

[GIT PULL] updates of German translation for maint branch

2013-09-11 Thread Jiang Xin
Hi, Junio Would you please pull the following into maint branch. And it can be merged to the master branch. This isn't really a bugfix but a nice to have in a maintenance release. ($gmane/233807) The following changes since commit 21860882c8782771e99aa68fab6e365c628ff39d: l10n: fr.po: hotfix

[PATCH 2/2] Use simpler relative_path when set_git_dir

2013-09-12 Thread Jiang Xin
. Suggested-by: Karsten Blees karsten.bl...@gmail.com Signed-off-by: Jiang Xin worldhello@gmail.com --- cache.h | 1 + path.c | 45 + setup.c | 5 + 3 files changed, 47 insertions(+), 4 deletions(-) diff --git a/cache.h b/cache.h index

[PATCH 1/2] relative_path should honor dos_drive_prefix

2013-09-12 Thread Jiang Xin
dos_drive_prefix, and add test cases for it in t0060. Reported-by: Tvangeste i.4m.l...@yandex.ru Helped-by: Johannes Sixt j...@kdbg.org Signed-off-by: Jiang Xin worldhello@gmail.com --- path.c| 20 t/t0060-path-utils.sh | 4 2 files changed, 24

Re: [PATCH 1/2] relative_path should honor dos_drive_prefix

2013-09-12 Thread Jiang Xin
/usr/lib share the same root and the former can be made to ../src relative to the latter; - //host1/usr/src and //host2/usr/lib are of separate roots. or something. But how could we know which platform supports network pathnames and needs such implementation. -- Jiang Xin

[PATCH v2 0/3] fixes for relative_path

2013-09-12 Thread Jiang Xin
Updates since v1: * New patch 1/3 on t0060, which use umambigous leading path (/foo). * Call tolower instead of strncasecmp in patch 2/3. * Rename simple_relative_path to remove_leading_path in patch 3/3. Jiang Xin (3): test: use unambigous leading path (/foo) for mingw relative_path should

[PATCH v2 1/3] test: use unambigous leading path (/foo) for mingw

2013-09-12 Thread Jiang Xin
In test cases for relative_path, path with one leading character (such as /a, /x) may be recogonized as a:/ or x:/ if there is such doc drive on MINGW platform. Use an umambigous leading path /foo instead. Signed-off-by: Jiang Xin worldhello@gmail.com --- t/t0060-path-utils.sh | 56

[PATCH v2 3/3] Use simpler relative_path when set_git_dir

2013-09-12 Thread Jiang Xin
. Suggested-by: Karsten Blees karsten.bl...@gmail.com Signed-off-by: Jiang Xin worldhello@gmail.com --- cache.h | 1 + path.c | 45 + setup.c | 5 + 3 files changed, 47 insertions(+), 4 deletions(-) diff --git a/cache.h b/cache.h index a47b9c0

[PATCH v2 2/3] relative_path should honor dos_drive_prefix

2013-09-12 Thread Jiang Xin
dos_drive_prefix, and add test cases for it in t0060. Reported-by: Tvangeste i.4m.l...@yandex.ru Helped-by: Johannes Sixt j...@kdbg.org Signed-off-by: Jiang Xin worldhello@gmail.com --- path.c| 20 t/t0060-path-utils.sh | 4 2 files changed, 24

Please pull git-l10n updates for git v1.7.12-rc2

2012-08-09 Thread Jiang Xin
to cc2f50dafe28fda6652e1ab78034aae49b495b08: l10n: Update Swedish translation (1168t0f0u) (2012-08-09 06:39:17 +0100) Jiang Xin (3): l10n: Update one message in git.pot l10n: zh_CN.po: update one translation Merge git://github.com/ralfth

Re: [ANNOUNCE] Git v1.7.12-rc3

2012-08-16 Thread Jiang Xin
Hi Junio, There is one commit on Swedish translation, and it can be added to the final 1.7.12 release. The following changes since commit 61b472ed8b090a3e9240590c85041120a54dd268: git svn: reset invalidates the memoized mergeinfo caches (2012-08-10 19:53:18 +) are available in the git

Re: [PATCH 6/7] Fix tests under GETTEXT_POISON on git-remote

2012-08-22 Thread Jiang Xin
' ' + test_expect_success C_LOCALE_OUTPUT 'remove remote' ' - test_expect_success 'add another remote' ' + test_expect_success C_LOCALE_OUTPUT 'add another remote' ' -- Jiang Xin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

  1   2   3   4   5   6   >