[PATCH/RFC] simple typo fix

2012-08-25 Thread Adrian Aichner
From: AichnerAd Please let me know what you think of this patch. The test mail I sent myself in gmail looked good with "Show original". Best regards Adrian --- Documentation/git-daemon.txt |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-daemon.txt

Re: [PATCH/RFC] git svn: don't introduce new paragraph for git-svn-id

2012-08-25 Thread Eric Wong
Robert Luberda wrote: > Junio C Hamano wrote: > > Eric Wong writes: > >> > >> I think having "svn" in "svn.trimsvnlog" twice is redundant and not ideal. > >> Perhaps just --trim-log and svn.trimlog? > > > > Do we ever want to trim "our" log when relaying the Git commits back > > to subversion?

Re: [PATCH/RFC] git svn: handle errors and concurrent commits in dcommit

2012-08-25 Thread Eric Wong
Robert Luberda wrote: > Eric Wong wrote: > > Oops, I'll push the following out since Junio already merged your > > original: > > I can see that you haven't pushed the change yet. Maybe it would be a > good idea to fix other style mistakes (extra spaces after redirections, > lack of spaces after

Re: libgit2 status

2012-08-25 Thread Carlos Martín Nieto
Nicolas Sebrecht writes: > The 25/08/12, Vicent Marti wrote: > >> The development of libgit2 happens 100% in the open. I don't know what >> "commercial entity" are you talking about, but there are several >> companies and independent contributors working on the Library at the >> moment. > > Right

Re: libgit2 status

2012-08-25 Thread Nicolas Sebrecht
The 25/08/12, Vicent Marti wrote: > The development of libgit2 happens 100% in the open. I don't know what > "commercial entity" are you talking about, but there are several > companies and independent contributors working on the Library at the > moment. Right but as far as I'm aware of Junio had

Re: libgit2 status

2012-08-25 Thread Vicent Marti
On Sat, Aug 25, 2012 at 2:56 AM, Andreas Ericsson wrote: > Politically, I'm not sure how keen the git community is on handing > over control to the core stuff of git to a commercial entity, The development of libgit2 happens 100% in the open. I don't know what "commercial entity" are you talking

Re: git no longer prompting for password

2012-08-25 Thread Jeff King
On Sat, Aug 25, 2012 at 03:56:01PM +0100, Iain Paton wrote: > > It's like the initial http requests do not get a 401, and the push > > proceeds, and then some later request causes a 401 when we do not expect > > it. Which is doubly odd, since we should also be able to handle that > > case (the fir

[PATCH RFC 0/2] Mixing English and a local language

2012-08-25 Thread Nguyễn Thái Ngọc Duy
The l10n effort leads to a situation where a contributor can submit a patch with some auto-generated information in his language, which may not be the team's language. We need to make sure exchange medium like patch is always in a common language that the team understands. Now this team language m

[PATCH 1/2] Allow to print diffstat in English regardless current locale

2012-08-25 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/apply.c | 2 +- diff.c | 19 --- diff.h | 2 +- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index d453c83..3f2779f 100644 --- a/builtin/apply.c +++ b/builtin/

[PATCH 2/2] format-patch: always print diffstat in English

2012-08-25 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/log.c | 1 + diff.c| 4 ++-- diff.h| 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index ecc2793..62f4b7e 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1225,6 +1225,7 @@ int c

Re: [PATCH 1/3] remote-testsvn.c: Avoid the getline() GNU extension function

2012-08-25 Thread Erik Faye-Lund
On Sat, Aug 25, 2012 at 7:13 PM, Ramsay Jones wrote: > > The getline() function is a GNU extension (you need to define > _GNU_SOURCE before including stdio.h) and is, therefore, not > portable. In particular, getline() is not available on MinGW. Actually, getline is a POSIX-2008 feature, so it's

Re: [PATCH 1/3] remote-testsvn.c: Avoid the getline() GNU extension function

2012-08-25 Thread Joachim Schmitz
Ramsay Jones wrote: The getline() function is a GNU extension (you need to define _GNU_SOURCE before including stdio.h) and is, therefore, not portable. In particular, getline() is not available on MinGW. In order to support non-GNU systems, we replace the call to getline() with (almost) equival

RE: [PATCH v6 15/16] remote-svn: add marks-file regeneration

2012-08-25 Thread Joachim Schmitz
> From: Joachim Schmitz [mailto:j...@schmitz-digital.de] > Sent: Saturday, August 25, 2012 5:55 PM > To: 'florian.achleitner.2.6...@gmail.com' > Cc: git@vger.kernel.org > Subject: Re: [PATCH v6 15/16] remote-svn: add marks-file regeneration > > "Florian Achleitner" schrieb im > Newsbeitrag news:

[PATCH v2] branch -v: align even when branch names are in UTF-8

2012-08-25 Thread Nguyễn Thái Ngọc Duy
Branch names are usually in ASCII so they are not the problem. The problem most likely comes from "(no branch)" translation, which is in UTF-8 and makes length calculation just wrong. Update document to mention the fact that we may want ref names in UTF-8. Encodings that produce invalid UTF-8 are

[PATCH 3/3] t9020-*.sh: Skip all tests when python not available

2012-08-25 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Florian, Since python is not installed on MinGW, this test fails with an "unable to spawn script" type message when attempting to execute svnrdump. So, could you, in addition to the previous patch, squash this into commit 2d597d73 ("Add a test script for remot

[PATCH 2/3] t9020-*.sh: Fix urls passed to git-remote in test setup

2012-08-25 Thread Ramsay Jones
In particular, the urls passed to git-remote have an extra '/' given after the schema prefix, like so: git remote add svnsim testsvn::sim:///$TEST_DIRECTORY/t9154/svn.dump git remote add svnfile testsvn::file:///$TEST_DIRECTORY/t9154/svn.dump Once the prefix is removed, the remainder of

[PATCH 1/3] remote-testsvn.c: Avoid the getline() GNU extension function

2012-08-25 Thread Ramsay Jones
The getline() function is a GNU extension (you need to define _GNU_SOURCE before including stdio.h) and is, therefore, not portable. In particular, getline() is not available on MinGW. In order to support non-GNU systems, we replace the call to getline() with (almost) equivalent code using strbuf

Re: [PATCH/RFC v4 02/13] read-cache.c: Re-read index if index file changed

2012-08-25 Thread Joachim Schmitz
"Thomas Gummerer" schrieb im Newsbeitrag news:<134529-6925-3-git-send-email-t.gumme...@gmail.com>... > Add the possibility of re-reading the index file, if it changed > while reading. > > The index file might change during the read, causing outdated > information to be displayed. We check if

Re: [PATCH v6 15/16] remote-svn: add marks-file regeneration

2012-08-25 Thread Joachim Schmitz
"Florian Achleitner" schrieb im Newsbeitrag news:<1345662961-9587-16-git-send-email-florian.achleitner.2.6...@gmail.com>... > fast-import mark files are stored outside the object database and are > therefore not fetched and can be lost somehow else. marks provide a > svn revision --> git sha1 ma

Re: misleading diff-hunk header

2012-08-25 Thread Tim Chase
On 08/24/12 23:29, Junio C Hamano wrote: > Tim Chase writes: >> If the documented purpose of "diff -p" (and by proxy >> diff.{type}.xfuncname) is to show the name of the *function* >> containing the changed lines, > > Yeah, the documentation is misleading, but I do not offhand think of > a be

Re: [PATCH] branch -v: align even when the first column is in UTF-8

2012-08-25 Thread Nguyen Thai Ngoc Duy
2012/8/25 Erik Faye-Lund : > On Fri, Aug 24, 2012 at 4:17 PM, Nguyễn Thái Ngọc Duy > wrote: >> 1 tập tin đã bị thay đổi, 5 được thêm vào(+), 3 bị xóa(-) > > Huh? Oh, that's something we should fix soon, too. I suggested a "project language" config key some time ago, where commands like format-p

Re: [PATCH] branch -v: align even when the first column is in UTF-8

2012-08-25 Thread Erik Faye-Lund
On Fri, Aug 24, 2012 at 4:17 PM, Nguyễn Thái Ngọc Duy wrote: > 1 tập tin đã bị thay đổi, 5 được thêm vào(+), 3 bị xóa(-) Huh? N�r��yb�X��ǧv�^�)޺{.n�+ا���ܨ}���Ơz�&j:+v���zZ+��+zf���h���~i���z��w���?�&�)ߢf

Re: libgit2 status

2012-08-25 Thread Andreas Ericsson
On 08/24/2012 04:02 PM, gree...@obbligato.org wrote: > What is the status of libgit2 WRT the overall git project? I recall > that there was some discussion of basing bits of git on libgit2 once it > matures. > > I ask because I'm starting a project to improve the abysmal speed of > git-subtree sp

RE: [RFC] Support for HP NonStop

2012-08-25 Thread Joachim Schmitz
> From: Junio C Hamano [mailto:gits...@pobox.com] > Sent: Friday, August 24, 2012 11:51 PM > To: Joachim Schmitz > Cc: git@vger.kernel.org > Subject: Re: [RFC] Support for HP NonStop > > "Joachim Schmitz" writes: > > > Reminds me of a related issue: in compat/fnmatch/fnmatch.c there is this: > >

[PATCH] apply: compute patch->def_name correctly under -p0

2012-08-25 Thread Junio C Hamano
Back when "git apply" was written, we made sure that the user can skip more than the default number of path components (i.e. 1) by giving "-p", but the logic for doing so was built around the notion of "we skip N slashes and stop". This obviously does not work well when running under -p0 where we

Re: [PATCH 00/17] Clean up how fetch_pack() handles the heads list

2012-08-25 Thread Michael Haggerty
On 08/23/2012 10:31 PM, Jeff King wrote: > I think part of the confusion of this code is that inside the loop over > the refs it is sometimes checking aspects of the ref, and sometimes > checking invariants of the loop (like args.fetch_all). Splitting it into > separate loops makes it easier to see