Re: [PATCH v3 00/26] inotify support

2014-02-08 Thread Torsten Bögershausen
On 03.02.14 05:28, Nguyễn Thái Ngọc Duy wrote: I managed to review the code 0..12/26, so some parts are missing. The list below became longer than what I intended, my comments may be hard to read, and there is a mixture of minor and major remarks. I would appreciate if we could have an outline

[PATCH 0/2] Ignore trailing spaces in .gitignore

2014-02-08 Thread Nguyễn Thái Ngọc Duy
Trailing spaces are invisible in most standard editors (*). git diff does show trailing spaces by default. But that does not help newly written .gitignore files. And trailing spaces are the source of frustration when writing .gitignore. So let's ignore them. Nobody sane would put a trailing space

[PATCH 1/2] dir: warn about trailing spaces in exclude pattern

2014-02-08 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- dir.c | 11 +++ 1 file changed, 11 insertions(+) diff --git a/dir.c b/dir.c index b35b633..9edde44 100644 --- a/dir.c +++ b/dir.c @@ -491,6 +491,16 @@ void clear_exclude_list(struct exclude_list *el) el-filebuf = NULL; }

[PATCH 2/2] dir: ignore trailing spaces in exclude patterns

2014-02-08 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- Documentation/gitignore.txt | 3 +++ dir.c | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt index b08d34d..8734c15 100644 ---

Re: git best strategy for two version development

2014-02-08 Thread Carlos Pereira
On 02/08/2014 03:56 AM, brian m. carlson wrote: On Sat, Feb 08, 2014 at 02:06:41AM +, Carlos Pereira wrote: Hello, I am a git and CVS newbie, I bought and red most of the excellent Pro Git book by Scott Chacon, but I still have a doubt. I have a package that I distribute in two

Re: [PATCH v3 00/26] inotify support

2014-02-08 Thread Duy Nguyen
Thanks for the comments. I can see I now have some work to do in the coming weeks :) On Sat, Feb 8, 2014 at 3:04 PM, Torsten Bögershausen tbo...@web.de wrote: I would appreciate if we could have an outline of the protocol as a seperate document somewhere, to be able to have a look at the

[PATCH] builtin/blame.c::prepare_lines: fix allocation size of sb-lineno

2014-02-08 Thread David Kastrup
If we are calling xrealloc on every single line, the least we can do is get the right allocation size. Signed-off-by: David Kastrup d...@gnu.org --- This should be less contentious than the patch in URL:http://permalink.gmane.org/gmane.comp.version-control.git/241561, Message-ID:

Re: [PATCH] builtin/blame.c::prepare_lines: fix allocation size of sb-lineno

2014-02-08 Thread David Kastrup
David Kastrup d...@gnu.org writes: If we are calling xrealloc on every single line, the least we can do is get the right allocation size. Signed-off-by: David Kastrup d...@gnu.org --- This should be less contentious than the patch in

Re: git: problematic git status output with some translations (such as fr_FR)

2014-02-08 Thread Duy Nguyen
On Fri, Dec 20, 2013 at 3:50 AM, Jonathan Nieder jrnie...@gmail.com wrote: Junio C Hamano wrote: Jonathan Nieder jrnie...@gmail.com writes: This includes the colon in the translated string, to make it easier to remember to keep the non-breaking space before it. Hmph, recent 3651e45c

Re: git best strategy for two version development

2014-02-08 Thread Øystein Walle
Carlos Pereira jose.carlos.pereira at ist.utl.pt writes: Hello, I am a git and CVS newbie, I bought and red most of the excellent Pro Git book by Scott Chacon, but I still have a doubt. I have a package that I distribute in two versions differing only in one library: version_A uses

Re: [PATCH v3 8/9] rebase: add the --gpg-sign option

2014-02-08 Thread Philip Oakley
On 07/02/14 23:50, brian m. carlson wrote: On Mon, Feb 03, 2014 at 01:42:06PM -0800, Junio C Hamano wrote: + --gpg-sign) + gpg_sign_opt=-S + ;; + --gpg-sign=*) + # Try to quote only the argument, as this will appear in human-readable +

gitweb.cgi bug

2014-02-08 Thread Dongsheng Song
On Thu, Feb 6, 2014 at 7:01 AM, Junio C Hamano gits...@pobox.com wrote: The latest maintenance release Git v1.8.5.4 is now available at the usual places. I have an git repo PROJECT.git, the full path is /srv/repo/git/PROJECT.git, when I set git_base_url_list in gitweb.conf:

[PATCH] log: add --show-linear-break to help see non-linear history

2014-02-08 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- This is a more serious attempt to make non-linear history more visible without --graph. It looks like this commit e4ddb05720710213108cd13ddd5a115e12a6211d Author: Andy Spencer andy753...@gmail.com

Re: [PATCH 1/2] dir: warn about trailing spaces in exclude pattern

2014-02-08 Thread Torsten Bögershausen
On 2014-02-08 09.10, Nguyễn Thái Ngọc Duy wrote: Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- dir.c | 11 +++ 1 file changed, 11 insertions(+) diff --git a/dir.c b/dir.c index b35b633..9edde44 100644 --- a/dir.c +++ b/dir.c @@ -491,6 +491,16 @@ void

Re: gitweb.cgi bug

2014-02-08 Thread Andrew Keller
On Feb 8, 2014, at 8:37 AM, Dongsheng Song wrote: I have an git repo PROJECT.git, the full path is /srv/repo/git/PROJECT.git, when I set git_base_url_list in gitweb.conf: @git_base_url_list = qw(https://192.168.30.239/repo/git git@192.168.30.239:repo/git); I

Re: [PATCH 0/2] Ignore trailing spaces in .gitignore

2014-02-08 Thread Jeff King
On Sat, Feb 08, 2014 at 03:10:02PM +0700, Nguyễn Thái Ngọc Duy wrote: Trailing spaces are invisible in most standard editors (*). git diff does show trailing spaces by default. But that does not help newly written .gitignore files. And trailing spaces are the source of frustration when

Re: Bug tracker (again)

2014-02-08 Thread brian m. carlson
On Sat, Feb 08, 2014 at 02:26:57PM +0700, Duy Nguyen wrote: So I wonder if we use debian bug tracker for git upstream. I haven't used debian tracker much (or debian for that matter). It's probably best just ask instead of searching and guessing. I suppose if debian people (mostly debian git

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

2014-02-08 Thread Thomas Rast
I see you are defining new glossary terms: shallow unvollständig grafted gesondert eingehängt I guess the first one is reasonable if we don't call anything incomplete? (I don't think we do, just checking.) I don't really like 'gesondert eingehängt', how about 'transplantiert'

Re: [RFH] hackday and GSoC topic suggestions

2014-02-08 Thread Thomas Rast
Jeff King p...@peff.net writes: On a similar note, the GSoC application deadline is Feb 14th. I am happy to be admin again and put together the application, but we will need an idea page. I'll set up a page to collect them, but in the meantime, please dump any ideas/discussion in this thread.

Re: [RFH] hackday and GSoC topic suggestions

2014-02-08 Thread Jeff King
On Sat, Feb 08, 2014 at 07:43:40PM +0100, Thomas Rast wrote: Jeff King p...@peff.net writes: On a similar note, the GSoC application deadline is Feb 14th. I am happy to be admin again and put together the application, but we will need an idea page. I'll set up a page to collect them, but

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

2014-02-08 Thread David Kastrup
Thomas Rast t...@thomasrast.ch writes: I see you are defining new glossary terms: shallow unvollständig grafted gesondert eingehängt I guess the first one is reasonable if we don't call anything incomplete? (I don't think we do, just checking.) oberflächlich seems better: a

Re: [RFH] hackday and GSoC topic suggestions

2014-02-08 Thread Thomas Rast
Jeff King p...@peff.net writes: Below is a list of features / bugs that I am taking to the hackday. I have the list below at https://github.com/trast/git/wiki/Todo-items (started at git-merge last year). I did a quick triage, but don't take my word for it. Perhaps it's not too late for

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

2014-02-08 Thread Thomas Rast
David Kastrup d...@gnu.org writes: Thomas Rast t...@thomasrast.ch writes: I don't really like 'gesondert eingehängt', how about 'transplantiert' instead? I suggest using the actual translation here as it is perfectly fitting for both literal and figurative meaning: aufgepfropft. I didn't

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

2014-02-08 Thread David Kastrup
Thomas Rast t...@thomasrast.ch writes: David Kastrup d...@gnu.org writes: Thomas Rast t...@thomasrast.ch writes: I don't really like 'gesondert eingehängt', how about 'transplantiert' instead? I suggest using the actual translation here as it is perfectly fitting for both literal and

[PATCH v4] l10n: de.po: translate 28 new messages

2014-02-08 Thread Ralf Thielow
Translate 28 new messages came from git.pot update in df49095 (l10n: git.pot: v1.9 round 1 (27 new, 11 removed) and d57b24b (l10n: git.pot: v1.9 round 2 (1 new)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- v4 corrects some translations according to Thomas' review. Thanks for that.

Re

2014-02-08 Thread Leung W Lok
I wish to discuss a very confidential business proposition with you. -- 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] l10n: de.po: translate 27 new messages

2014-02-08 Thread Ralf Thielow
2014-02-08 20:22 GMT+01:00 David Kastrup d...@gnu.org: verberge keine aufgepfropften Commits seems much more in the spirit of the original terminology. verbirgt keine Commits mit künstlichen Vorgängern is plainly wrong anyway since it is not the commits _with_ grafts which are hidden but

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

2014-02-08 Thread David Kastrup
Ralf Thielow ralf.thie...@gmail.com writes: 2014-02-08 20:22 GMT+01:00 David Kastrup d...@gnu.org: verberge keine aufgepfropften Commits seems much more in the spirit of the original terminology. verbirgt keine Commits mit künstlichen Vorgängern is plainly wrong anyway since it is not the

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

2014-02-08 Thread David Kastrup
Ralf Thielow ralf.thie...@gmail.com writes: Translate 28 new messages came from git.pot update in df49095 (l10n: git.pot: v1.9 round 1 (27 new, 11 removed) and d57b24b (l10n: git.pot: v1.9 round 2 (1 new)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- v4 corrects some

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

2014-02-08 Thread Ralf Thielow
2014-02-08 20:59 GMT+01:00 David Kastrup d...@gnu.org: Ralf Thielow ralf.thie...@gmail.com writes: 2014-02-08 20:22 GMT+01:00 David Kastrup d...@gnu.org: verberge keine aufgepfropften Commits seems much more in the spirit of the original terminology. verbirgt keine Commits mit künstlichen

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

2014-02-08 Thread Ralf Thielow
2014-02-08 21:11 GMT+01:00 David Kastrup d...@gnu.org: Ralf Thielow ralf.thie...@gmail.com writes: Translate 28 new messages came from git.pot update in df49095 (l10n: git.pot: v1.9 round 1 (27 new, 11 removed) and d57b24b (l10n: git.pot: v1.9 round 2 (1 new)). Signed-off-by: Ralf Thielow

[PATCH v5] l10n: de.po: translate 28 new messages

2014-02-08 Thread Ralf Thielow
Translate 28 new messages came from git.pot update in df49095 (l10n: git.pot: v1.9 round 1 (27 new, 11 removed) and d57b24b (l10n: git.pot: v1.9 round 2 (1 new)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 99

[PATCH 1/4] docs/merge-strategies: remove hyphen from mis-merges

2014-02-08 Thread Albert L. Lash, IV
The term mismerges without hyphen is used a few other places in the documentation. Let's update this to be consistent. Signed-off-by: Albert L. Lash, IV ala...@bloomberg.net --- Documentation/merge-strategies.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[PATCH 4/4] docs/git-blame: explain more clearly the example pickaxe use

2014-02-08 Thread Albert L. Lash, IV
We state that the following paragraph mentions the pickaxe interface, but the term pickaxe is not then used. This change clarifies that the example command uses the pickaxe interface and what it is searching for. Signed-off-by: Albert L. Lash, IV ala...@bloomberg.net ---

[PATCH 3/4] docs/git-clone: clarify use of --no-hardlinks option

2014-02-08 Thread Albert L. Lash, IV
Current text claims optimization, implying the use of hardlinks, when this option ratchets down the level of efficiency. This change explains the difference made by using this option, namely copying instead of hardlinking, and why it may be useful. Signed-off-by: Albert L. Lash, IV

[PATCH 2/4] docs/git-remote: capitalize first word of initial blurb

2014-02-08 Thread Albert L. Lash, IV
All other man files have capitalized descriptions which immediately follow the command's name. Let's capitalize this one too for consistency. Signed-off-by: Albert L. Lash, IV ala...@bloomberg.net --- Documentation/git-remote.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

Re: [PATCH] builtin/blame.c::prepare_lines: fix allocation size of sb-lineno

2014-02-08 Thread Jeff King
On Sat, Feb 08, 2014 at 10:49:40AM +0100, David Kastrup wrote: But please note that since sb-lineno originally comes from a zeroed memory area and is passed to xrealloc, this requires that after int *p; memset(p, 0, sizeof(p)); the equivalence ((void *)p == NULL) will hold. While

[PATCH] l10n: de.po: correct message when hiding commits by craft

2014-02-08 Thread Ralf Thielow
The recent translation was giving the idea that all commits based on a graft were meant to be hidden. Make it clear that it is the graft commit itself. Reported-by: David Kastrup d...@gnu.org Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 2 +- 1 file changed, 1 insertion(+),

[PATCH] l10n: de.po: correct message when hiding commits by craft

2014-02-08 Thread Ralf Thielow
The recent translation was giving the idea that all commits based on a graft were meant to be hidden. Make it clear that it is the graft commit itself. Reported-by: David Kastrup d...@gnu.org Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 2 +- 1 file changed, 1 insertion(+),

Re: [PATCH] builtin/blame.c::prepare_lines: fix allocation size of sb-lineno

2014-02-08 Thread David Kastrup
Jeff King p...@peff.net writes: However, is there a reason not to use: sizeof(*sb-lineno) rather than sizeof(int) to avoid type-mismatch errors entirely (this applies both to this patch, and to any proposed rewrites using malloc). It deviates from the style of the original code by

Re: [PATCH 12/13] Makefile: teach scripts to include make variables

2014-02-08 Thread Thomas Rast
Jeff King p...@peff.net writes: The current scheme for getting build-time variables into a shell script is to munge the script with sed, and stick the munged variable into a special sentinel file so that make knows about the dependency. Instead, we can combine both functions by generating a

[PATCH] hashmap.h: make sure map entries are tightly packed

2014-02-08 Thread Karsten Blees
Am 07.02.2014 21:56, schrieb Junio C Hamano: * kb/fast-hashmap (2014-01-03) 19 commits - hashmap.h: make sure map entries are tightly packed (merged to 'next' on 2014-01-03 at dc85001) [...] The tip one does not seem to have reached concensus (yet). See discussion leading up to

Re: [PATCH 0/2] Ignore trailing spaces in .gitignore

2014-02-08 Thread Duy Nguyen
On Sat, Feb 8, 2014 at 11:45 PM, Jeff King p...@peff.net wrote: On Sat, Feb 08, 2014 at 03:10:02PM +0700, Nguyễn Thái Ngọc Duy wrote: Trailing spaces are invisible in most standard editors (*). git diff does show trailing spaces by default. But that does not help newly written .gitignore

[PATCH v2 0/2] Ignore trailing spaces in .gitignore

2014-02-08 Thread Nguyễn Thái Ngọc Duy
This reroll now respects backslash quoting. Thanks Jeff and Torsten for the comments. Nguyễn Thái Ngọc Duy (2): dir: warn about trailing spaces in exclude patterns dir: ignore trailing spaces in exclude patterns Documentation/gitignore.txt | 3 +++ dir.c | 20

[PATCH v2 2/2] dir: ignore trailing spaces in exclude patterns

2014-02-08 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- Documentation/gitignore.txt | 3 +++ dir.c | 21 - t/t0008-ignores.sh | 8 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/Documentation/gitignore.txt

[PATCH v2 1/2] dir: warn about trailing spaces in exclude patterns

2014-02-08 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- dir.c | 17 + t/t0008-ignores.sh | 31 +++ 2 files changed, 48 insertions(+) diff --git a/dir.c b/dir.c index b35b633..6162209 100644 --- a/dir.c +++ b/dir.c @@ -491,6 +491,22 @@

Re: gitweb.cgi bug

2014-02-08 Thread Dongsheng Song
On Sun, Feb 9, 2014 at 12:29 AM, Andrew Keller and...@kellerfarm.com wrote: On Feb 8, 2014, at 8:37 AM, Dongsheng Song wrote: I have an git repo PROJECT.git, the full path is /srv/repo/git/PROJECT.git, when I set git_base_url_list in gitweb.conf: @git_base_url_list =