[PATCH v2 7/7] Fix tests under GETTEXT_POISON on parseopt

2012-08-26 Thread Jiang Xin
Use i18n-specific test functions in test scripts for parseopt tests. This issue was was introduced in v1.7.10.1-488-g54e6d: 54e6d i18n: parseopt: lookup help and argument translations when showing usage and been broken under GETTEXT_POISON=YesPlease since. Signed-off-by: Jiang Xin Signed-o

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

2012-08-26 Thread Jiang Xin
Use i18n-specific test functions in test scripts for git-remote. This issue was was introduced in v1.7.10-233-gbb16d5: bb16d5 i18n: remote: mark strings for translation and been broken under GETTEXT_POISON=YesPlease since. Signed-off-by: Jiang Xin Signed-off-by: Nguyễn Thái Ngọc Duy --- t

[PATCH v2 5/7] Fix tests under GETTEXT_POISON on pack-object

2012-08-26 Thread Jiang Xin
Use i18n-specific test functions in test scripts for pack-object. This issue was was introduced in v1.7.10.2-556-g46140: 46140 index-pack: use streaming interface for collision test on large blobs cf2ba pack-objects: use streaming interface for reading large loose blobs and been broken un

[PATCH v2 3/7] Fix tests under GETTEXT_POISON on diffstat

2012-08-26 Thread Jiang Xin
Use i18n-specific test functions in test scripts for diffstat. This issue was was introduced in v1.7.9-1-g7f814: 7f814 Use correct grammar in diffstat summary line and been broken under GETTEXT_POISON=YesPlease since. Signed-off-by: Jiang Xin Signed-off-by: Nguyễn Thái Ngọc Duy --- t/t400

[PATCH v2 4/7] Fix tests under GETTEXT_POISON on git-apply

2012-08-26 Thread Jiang Xin
Use i18n-specific test functions in test scripts for git-apply. This issue was was introduced in the following commits: de373 i18n: apply: mark parseopt strings for translation 3638e i18n: apply: mark strings for translation and been broken under GETTEXT_POISON=YesPlease since. Signed-of

[PATCH v2 2/7] Fix tests under GETTEXT_POISON on git-stash

2012-08-26 Thread Jiang Xin
Use i18n-specific test functions in test scripts for git-stash. This issue was was introduced in v1.7.4.1-119-g355ec: 355ec i18n: git-status basic messages and been broken under GETTEXT_POISON=YesPlease since. Signed-off-by: Jiang Xin Signed-off-by: Nguyễn Thái Ngọc Duy --- t/t3903-stash.

[PATCH v2 1/7] Fix tests under GETTEXT_POISON on relative dates

2012-08-26 Thread Jiang Xin
Use a i18n-specific test_i18ncmp in t/t0006-data.sh for relative dates tests. This issue was was introduced in v1.7.10-230-g7d29a: 7d29a i18n: mark relative dates for translation and been broken under GETTEXT_POISON=YesPlease since. Signed-off-by: Jiang Xin Signed-off-by: Nguyễn Thái Ngọc D

[PATCH v2 0/7] Gettext poison fixes

2012-08-26 Thread Jiang Xin
Update patch 5/7 (Fix tests under GETTEXT_POISON on pack-object) and patch 6/7 (Fix tests under GETTEXT_POISON on git-remote) in this new series of patches. Not much to say. With this series, the test suite should pass again with gettext poison on. It's independent with the parseopt-i18n series I

[PATCH v2] test: set the realpath of CWD as TRASH_DIRECTORY

2012-08-26 Thread Jiang Xin
Some testcases will fail if current work directory is on a symlink. symlink$ sh ./t4035-diff-quiet.sh $ sh ./t4035-diff-quiet.sh --root=/symlink $ TEST_OUTPUT_DIRECTORY=/symlink sh ./t4035-diff-quiet.sh This is because the realpath of ".git" directory will be returned when running the

[PATCH 5/4 v2] wincred: port to generic credential helper (UNTESTED)

2012-08-26 Thread Philipp A. Hartmann
From: "Philipp A. Hartmann" This patch is an experiment to port the wincred helper to the generic implementation. As of know, it is completely untested. In addition to porting the helper to the generic API, this patch clears up all passwords from memory, which reduces the total amount to saved

Re: Inverting the --committer option to git-log with v1.7.5.4

2012-08-26 Thread Junio C Hamano
"Todd A. Jacobs" writes: > Is there currently a better way to request logs for "everyone but > committer x" in Git? If not, is this a feature that someone who > understands the Git source might find useful enough to add in? No, there is not. I wouldn't comment on the potential usefulness of suc

Inverting the --committer option to git-log with v1.7.5.4

2012-08-26 Thread Todd A. Jacobs
I wanted to search a repository for all commits that were *not* committed by a particular person. While I eventually managed to build a regular expression that worked for my limited use case, it seems like there ought to be a more sensible way to find the data I'm looking for. As an example, this

[PATCH 5/4] wincred: port to generic credential helper (UNTESTED)

2012-08-26 Thread Philipp A. Hartmann
From: "Philipp A. Hartmann" This patch is an experiment to port the wincred helper to the generic implementation. As of know, it is completely untested. In addition to porting the helper to the generic API, this patch clears up all passwords from memory, which reduces the total amount to saved

Re: t9020 broken on pu ?

2012-08-26 Thread Florian Achleitner
On Sunday 26 August 2012 21:32:58 Torsten Bögershausen wrote: > > The reason is that contrib/svn-fe, where remote-svn is in, is not yet > > built automatically by the toplevel makefile, so the remote helper can't > > be found. If you build it manually it should work. > > Working on it .. > > Hi F

Re: t9020 broken on pu ?

2012-08-26 Thread Torsten Bögershausen
> The reason is that contrib/svn-fe, where remote-svn is in, is not yet built > automatically by the toplevel makefile, so the remote helper can't be found. > If you build it manually it should work. > Working on it .. Hi Florian, the compilation as such is started, but gives problems on Mac O

Re: libgit2 status

2012-08-26 Thread Junio C Hamano
Junio C Hamano writes: > Looking at the build dependency of libgit2 itself, I do not think > tighter integration of the libgit2 itself into the git-core is not > likely to happen very soon, and also is not necessarily a good thing > to do. Obviously I meant "I think it is not likely to happen an

Re: misleading diff-hunk header

2012-08-26 Thread Junio C Hamano
Stefano Lattarini writes: > On 08/25/2012 02:56 PM, Tim Chase wrote: >> 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,...

[PATCH] doc: "git checkout -b/-B/--orphan" always takes a branch name

2012-08-26 Thread Junio C Hamano
While the synopsis section makes it clear that the new branch name is the parameter to these flags, the option description did not. Signed-off-by: Junio C Hamano --- Documentation/git-checkout.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/git-checkou

Re: Re*: mergetool: support --tool-help option like difftool does

2012-08-26 Thread Jens Lehmann
Am 24.08.2012 10:31, schrieb David Aguilar: > On Thu, Aug 23, 2012 at 10:39 AM, Junio C Hamano wrote: >> David Aguilar writes: >>> Would the ability to resolve the various merge situations using >>> the command-line be a wanted addition? >>> >>> This would let a submodule or deleted/modified enco

Re: git checkout -t -B

2012-08-26 Thread Junio C Hamano
乙酸鋰 writes: > git checkout -t -B origin/abcde > works > > but > git checkout -B -t origin/abcde > does not. > > Could you document the order of parameters or fix the behaviour? It is crystal clear that -b/-B/--orphan must be followed by the name of the branch you are creating from the SYNOPSIS s

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

2012-08-26 Thread Junio C Hamano
Erik Faye-Lund writes: > 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? Perhaps format-patch should always use C locale. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a mes

Re: libgit2 status

2012-08-26 Thread Junio C Hamano
Andreas Ericsson writes: > 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, but it > doesn't seem to be a dying project, so I'd say go ahead and do it. I do not think commercial-ness of any entity comes into the pi

Re: [PATCH] contrib: GnomeKeyring support + generic helper implementation

2012-08-26 Thread Philipp A. Hartmann
n 26/08/12 19:46, Junio C Hamano wrote: > Junio C Hamano writes: > >> Jeff King writes: >> >>> However, the shared bits are simple enough that maybe that is not a >>> concern. An interesting test would be to add a 5/4 porting Erik's win32 >>> credential helper, since that is the platform least l

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

2012-08-26 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > 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.

Re: [PATCH] contrib: GnomeKeyring support + generic helper implementation

2012-08-26 Thread Junio C Hamano
Junio C Hamano writes: > Jeff King writes: > >> However, the shared bits are simple enough that maybe that is not a >> concern. An interesting test would be to add a 5/4 porting Erik's win32 >> credential helper, since that is the platform least like our other ones. > > Very true. > >> So I am O

Re: [PATCH 04/17] Name local variables more consistently

2012-08-26 Thread Junio C Hamano
Jeff King writes: > On Thu, Aug 23, 2012 at 10:10:29AM +0200, mhag...@alum.mit.edu wrote: > >> From: Michael Haggerty >> >> Use the names (nr_heads, heads) consistently across functions, instead >> of sometimes naming the same values (nr_match, match). > > I think this is fine, although: > >> -

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

2012-08-26 Thread Junio C Hamano
Erik Faye-Lund writes: > 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, getli

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

2012-08-26 Thread Junio C Hamano
mhag...@alum.mit.edu writes: > Re-roll, incorporating Jeff's suggestions. Some commit messages have > also been improved, but the only interdiff is that match_pos is > renamed to head_pos in filter_refs(). > > This patch series applies to the merge between master and > jc/maint-push-refs-all, tho

Re: git no longer prompting for password

2012-08-26 Thread Iain Paton
On 26/08/12 11:13, Jeff King wrote: > Yeah, I'm surprised it took this long to come up, too. Perhaps most > people just do anonymous http, and then rely on ssh for pushing to > achieve the same effect. Or maybe my analysis of the problem is wrong. > :) I'd be using ssh to push too, but the simple

Re: misleading diff-hunk header

2012-08-26 Thread Stefano Lattarini
On 08/25/2012 02:56 PM, Tim Chase wrote: > 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

Re: git no longer prompting for password

2012-08-26 Thread Jeff King
On Sun, Aug 26, 2012 at 10:57:59AM +0100, Iain Paton wrote: > > The odd URL is because we are probing to see if the server even supports > > smart-http. But note that it does not match your regex above, which > > requires "/git-receive-pack". It looks like that is pulled straight from > > the git-

Re: git no longer prompting for password

2012-08-26 Thread Iain Paton
On 25/08/12 21:39, Jeff King wrote: > I think your regex is the culprit. The first request comes in with: > >>> GET /git/test.git/info/refs?service=git-receive-pack HTTP/1.1 > > The odd URL is because we are probing to see if the server even supports > smart-http. But note that it does not match

git checkout -t -B

2012-08-26 Thread 乙酸鋰
Dear Sir, I want to make current branch abcde a remote tracking branch with origin/abcde. Since I am working on current branch abcde, I have to use the force option. So I run git checkout -t -B origin/abcde works but git checkout -B -t origin/abcde does not. Could you document the order of para

Re: libgit2 status

2012-08-26 Thread Elia Pinto
I know julio notes about libgit2. Anyway the rpm5 mantainer had decided to integrate libgit2 recently. Jfi. Regards 2012/8/25, 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