Another slash at index size

2013-02-21 Thread Nguyễn Thái Ngọc Duy
I noticed that even with v4, we still duplicate a lot of info in the remaining fields. ce_uid and ce_guid for instance are unlikely to change ever between entries. So I attempt to store offsets between the previous entry instead. The result looks good. This is webkit index: 25M index-v2 14M

running git from non-standard location on Mac

2013-02-21 Thread James French
Hi, I wonder if someone could help me. I installed git on a Mac and then I copied the install somewhere else (which I do want to do, trust me).  I'm now having trouble with git svn. I'm getting Can't locate Git/SVN.pm in @INC... I've added the bin folder to PATH. What else do I need to do? Do

RFD: concatening textconv filters

2013-02-21 Thread Michael J Gruber
During my day-to-day UGFWIINIT I noticed that we don't do textconv iteratively. E.g.: I have a file SuperSecretButDumbFormat.pdf.gpg and textconv filters with attributes set for *.gpg and *.pdf (using gpg resp. pdftotext). For Git, the file has only the gpg attribute, of course. In this case, I

Re: running git from non-standard location on Mac

2013-02-21 Thread Konstantin Khomoutov
On Thu, 21 Feb 2013 09:48:36 + James French james.fre...@naturalmotion.com wrote: I wonder if someone could help me. I installed git on a Mac and then I copied the install somewhere else (which I do want to do, trust me).  I'm now having trouble with git svn. I'm getting Can't locate

Re: running git from non-standard location on Mac

2013-02-21 Thread Matthieu Moy
Konstantin Khomoutov flatw...@users.sourceforge.net writes: This [1] should help you get started with affecting @INC. In the particular case of Git, the Makefile hardcodes the path to the Git library. The script git-svn in Git's exec-path should start with: use lib (split(/:/, $ENV{GITPERLLIB}

RE: running git from non-standard location on Mac

2013-02-21 Thread James French
-Original Message- From: Konstantin Khomoutov [mailto:flatw...@users.sourceforge.net] Sent: 21 February 2013 10:35 To: James French Cc: git@vger.kernel.org Subject: Re: running git from non-standard location on Mac On Thu, 21 Feb 2013 09:48:36 + James French

Re: git branch HEAD dumps core when on detached head (NULL pointer dereference)

2013-02-21 Thread Duy Nguyen
On Thu, Feb 21, 2013 at 7:27 PM, Per Cederqvist ced...@opera.com wrote: Running git branch HEAD may be a stupid thing to do. It actually was a mistake on my part. Still, I don't think git should dereference a NULL pointer. We should not. Can you make a patch to fix it (with test cases)? You

git branch --contains x y creates a branch instead of checking containment

2013-02-21 Thread Per Cederqvist
The git branch --list --contains x y command lists all branches that contains commit x and matches the pattern y. Reading the git-branch(1) manual page gives the impression that --list is redundant, and that you can instead write git branch --contains x y That command does something

Re: git branch HEAD dumps core when on detached head (NULL pointer dereference)

2013-02-21 Thread Per Cederqvist
On 02/21/13 13:50, Duy Nguyen wrote: On Thu, Feb 21, 2013 at 7:27 PM, Per Cederqvist ced...@opera.com wrote: Running git branch HEAD may be a stupid thing to do. It actually was a mistake on my part. Still, I don't think git should dereference a NULL pointer. We should not. Can you make a

Re: git branch HEAD dumps core when on detached head (NULL pointer dereference)

2013-02-21 Thread Duy Nguyen
On Thu, Feb 21, 2013 at 8:24 PM, Per Cederqvist ced...@opera.com wrote: Sorry, but isolating the issue reporting it here is about as much time as I can spend on this issue. Learning the coding standard of Git and how to write test cases is not something I'm prepared to do, at least not at the

[PATCH] branch: segfault fixes and validation

2013-02-21 Thread Nguyễn Thái Ngọc Duy
branch_get() can return NULL (so far on detached HEAD only) but some code paths in builtin/branch.c cannot deal with that and cause segfaults. Fix it. While at there, make sure to bail out when the user gives 2 or more arguments, but only the first one is processed. Reported-by: Per Cederqvist

[PATCH] archive: let remote clients get reachable commits

2013-02-21 Thread Sergey Segeev
Some time we need to get valid commit without a ref but with proper tree-ish, now we can't do that. This patch allow upload-archive's to use reachability checking rather than checking that is a ref. This means a remote client can fetch a tip of any valid sha1 or tree-ish. --- archive.c

Re: Google Summer of Code 2013 (GSoC13)

2013-02-21 Thread Carlos Martín Nieto
Michael Schubert s...@schu.io writes: On 02/18/2013 06:42 PM, Jeff King wrote: I will do it again, if people feel strongly about Git being a part of it. However, I have gotten a little soured on the GSoC experience. Not because of anything Google has done; it's a good idea, and I think they

Re: Google Summer of Code 2013 (GSoC13)

2013-02-21 Thread Thomas Rast
Shawn Pearce spea...@spearce.org writes: On Mon, Feb 18, 2013 at 9:42 AM, Jeff King p...@peff.net wrote: On Mon, Feb 18, 2013 at 06:23:01PM +0100, Thomas Rast wrote: * We need an org admin. AFAIK this was done by Peff and Shawn in tandem last year. Would you do it again? I will do it

Re: git branch --contains x y creates a branch instead of checking containment

2013-02-21 Thread Jeff King
On Thu, Feb 21, 2013 at 02:00:27PM +0100, Per Cederqvist wrote: That command does something completely different, though. The --contains x part is silently ignored, so it creates a branch named y pointing at HEAD. Tested in git 1.8.1.1 and 1.8.1.4. In my opinion, there are two ways to

Re: git branch --contains x y creates a branch instead of checking containment

2013-02-21 Thread Per Cederqvist
On 02/21/13 16:58, Jeff King wrote: On Thu, Feb 21, 2013 at 02:00:27PM +0100, Per Cederqvist wrote: That command does something completely different, though. The --contains x part is silently ignored, so it creates a branch named y pointing at HEAD. Tested in git 1.8.1.1 and 1.8.1.4. In my

Re: RFD: concatening textconv filters

2013-02-21 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net writes: ... but wondering whether we could and should support concatenating filters by either - making it easy to request it (say by setting filter.gpgtopdftotext.textconvpipe to a list of textconv filter names which are to be applied in sequence)

Re: [PATCH] branch: segfault fixes and validation

2013-02-21 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: branch_get() can return NULL (so far on detached HEAD only)... Do you anticipate any other cases where the API call should validly return NULL? I offhand do not, ... but some code paths in builtin/branch.c cannot deal with that and cause

Re: git branch --contains x y creates a branch instead of checking containment

2013-02-21 Thread Junio C Hamano
Per Cederqvist ced...@opera.com writes: On 02/21/13 16:58, Jeff King wrote: On Thu, Feb 21, 2013 at 02:00:27PM +0100, Per Cederqvist wrote: That command does something completely different, though. The --contains x part is silently ignored, so it creates a branch named y pointing at HEAD.

Fw:เบื้องหลัง 16 ศพบาเจาะ

2013-02-21 Thread december24
เมื่อกลางดึกวันที่ 13 ก.พ. 56 คนร้ายกว่า 50 คน บุกโจมตีฐานทหารนาวิกโยธินที่ บ้านยือลอ ต.บาเระเหนือ อ.บาเจาะ จ.นราธิวาส มีผู้เสียชีวิต 16 คน เป็นข่าวที่น่า สะเทือนใจมาก แม้ว่าผู้ที่เสียชีวิตจะเป็นคนร้าย ถึงยังไงพวกเขาเหล่านั้นล้วนแต่เป็นคน ไทยด้วยกัน

RE: QNX support

2013-02-21 Thread Kraai, Matt
Junio C Hamano writes: David Ondřich david.ondr...@aveco.com writes: I've read [1] recently, there's been some QNX port being initiated. Does that involve also old versions of QNX 4? No, I haven't been working on QNX 4 support. I've been targeting QNX 6.3.2, with a little testing on QNX

Re: [PATCH v4.1 09/12] sequencer.c: teach append_signoff to avoid adding a duplicate newline

2013-02-21 Thread Junio C Hamano
Brandon Casey draf...@gmail.com writes: Teach append_signoff to detect whether a blank line exists at the position that the signed-off-by line will be added, and refrain from adding an additional one if one already exists. Or, add an additional line if one is needed to make sure the new

Re: Credentials and the Secrets API...

2013-02-21 Thread John Szakmeister
On Wed, Feb 20, 2013 at 12:01 PM, Ted Zlatanov t...@lifelogs.com wrote: On Sat, 9 Feb 2013 05:58:47 -0500 John Szakmeister j...@szakmeister.net wrote: [snip] JS Yes, I think it has. Several other applications appear to be using JS it, including some things considered core in Fedora--which

Re: Re* [PATCH 2/2] check-ignore.c: fix segfault with '.' argument from repo root

2013-02-21 Thread Junio C Hamano
Adam Spiers g...@adamspiers.org writes: On Tue, Feb 19, 2013 at 06:53:07PM -0800, Junio C Hamano wrote: Adam Spiers g...@adamspiers.org writes: OK, thanks for the information. IMHO it would be nice if 'git format-patch' and 'git am' supported this style of inline patch inclusion, but

[PATCH 1/2] format-patch: rename no_inline field

2013-02-21 Thread Junio C Hamano
The name of the fields invites a misunderstanding that setting it to false, saying No, I will not to tell you not to inline, make the patch inlined in the body of the message, but that is not what it does. The result is still a MIME attachment as long as mime_boundary is set. This field only

[PATCH 1/2] git-filter-branch.txt: clarify ident variables usage

2013-02-21 Thread Tadeusz Andrzej Kadłubowski
There is a rare edge case of git-filter-branch: a filter that unsets identity variables from the environment. Link to git-commit-tree clarifies how Git would fall back in this situation. Signed-off-by: Tadeusz Andrzej Kadłubowski y...@hell.org.pl --- Documentation/git-filter-branch.txt | 6

[PATCH 2/2] Documentation: filter-branch env-filter example

2013-02-21 Thread Tadeusz Andrzej Kadłubowski
filter-branch --env-filter example that shows how to change the email address in all commits before publishing a project. Signed-off-by: Tadeusz Andrzej Kadłubowski y...@hell.org.pl --- Documentation/git-filter-branch.txt | 21 + 1 file changed, 21 insertions(+) diff --git

Re: [PATCH v4.1 09/12] sequencer.c: teach append_signoff to avoid adding a duplicate newline

2013-02-21 Thread Brandon Casey
On Thu, Feb 21, 2013 at 12:26 PM, Brandon Casey draf...@gmail.com wrote: But, this does not fix the same problem for 'cherry-pick --edit -s' when used to cherry-pick a commit without a sob. Correction: when used to cherry-pick a commit with an empty commit message. -- To unsubscribe from this

Re: [PATCH v4.1 09/12] sequencer.c: teach append_signoff to avoid adding a duplicate newline

2013-02-21 Thread Brandon Casey
On Thu, Feb 21, 2013 at 10:51 AM, Junio C Hamano gits...@pobox.com wrote: Brandon Casey draf...@gmail.com writes: Teach append_signoff to detect whether a blank line exists at the position that the signed-off-by line will be added, and refrain from adding an additional one if one already

[PATCH 2/2] format-patch: --inline-single

2013-02-21 Thread Junio C Hamano
Some people may find it convenient to append a simple patch at the bottom of a discussion e-mail separated by a scissors mark, ready to be applied with git am -c. Introduce --inline-single option to format-patch to do so. A typical usage example might be to start 'F'ollow-up to a discussion,

Re: [PATCH 1/2] git-filter-branch.txt: clarify ident variables usage

2013-02-21 Thread Junio C Hamano
Tadeusz Andrzej Kadłubowski y...@hell.org.pl writes: There is a rare edge case of git-filter-branch: a filter that unsets identity variables from the environment. Link to git-commit-tree clarifies how Git would fall back in this situation. I find it unclear in the updated text _why_ the

Re: [PATCH 2/2] Documentation: filter-branch env-filter example

2013-02-21 Thread Junio C Hamano
Tadeusz Andrzej Kadłubowski y...@hell.org.pl writes: filter-branch --env-filter example that shows how to change the email address in all commits before publishing a project. Signed-off-by: Tadeusz Andrzej Kadłubowski y...@hell.org.pl --- Assuming that the result formats well both as html

Re: [PATCH v4.1 09/12] sequencer.c: teach append_signoff to avoid adding a duplicate newline

2013-02-21 Thread Junio C Hamano
Brandon Casey draf...@gmail.com writes: Yes. The fix described by John Keeping restores the above behavior for 'commit -s'. Or the fix I described which inserts two preceding newlines so it looks like this:

[PATCH] Fix in Git.pm cat_blob crashes on large files

2013-02-21 Thread Joshua Clayton
Greetings. This is my first patch here. Hopefully I get the stylistic political details right... :) Patch applies against maint and master (If I understand the mechanics, in theory a negative offset should work, if the values lined up just right, but would be very wrong, overwriting the lower

Re: [PATCH] Fix in Git.pm cat_blob crashes on large files

2013-02-21 Thread Jeff King
On Thu, Feb 21, 2013 at 02:13:32PM -0800, Joshua Clayton wrote: Greetings. This is my first patch here. Hopefully I get the stylistic political details right... :) Patch applies against maint and master I have some comments. :) The body of your email should contain the commit message

Re: [RFC] Provide a mechanism to turn off symlink resolution in ceiling paths

2013-02-21 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: Unfortunately I am swamped with other work right now so I don't have time to test the code and might not be able to respond promptly to feedback. A note like the above is a good way to give a cue to others so that we can work together to pick up,

Re: [PATCH 2/2] format-patch: --inline-single

2013-02-21 Thread Jeff King
On Thu, Feb 21, 2013 at 12:26:22PM -0800, Junio C Hamano wrote: Some people may find it convenient to append a simple patch at the bottom of a discussion e-mail separated by a scissors mark, ready to be applied with git am -c. Introduce --inline-single option to format-patch to do so. A

Re: [PATCH] Fix in Git.pm cat_blob crashes on large files

2013-02-21 Thread Joshua Clayton
On Thu, Feb 21, 2013 at 2:43 PM, Jeff King p...@peff.net wrote: On Thu, Feb 21, 2013 at 02:13:32PM -0800, Joshua Clayton wrote: Greetings. This is my first patch here. Hopefully I get the stylistic political details right... :) Patch applies against maint and master I have some comments.

Re: [PATCH] Fix in Git.pm cat_blob crashes on large files

2013-02-21 Thread Jeff King
On Thu, Feb 21, 2013 at 03:18:40PM -0800, Joshua Clayton wrote: By having the read and flush size be the same, it's much simpler. My original bugfix did just read 1024, and write 1024. That works fine and, yes, is simpler. I changed it to be more similar to the original code in case there

Re: git svn problem, probably a regression

2013-02-21 Thread RIceball LEE
Joseph Crowell joseph.w.crowell at gmail.com writes: Use of uninitialized value $u in substitution (s///) at /usr/local/Cellar/git/1.8.0/lib/Git/SVN.pm line 106. Use of uninitialized value $u in concatenation (.) or string at /usr/local/Cellar/git/1.8.0/lib/Git/SVN.pm line 106.

Re: [PATCH v3 4/4] t7800: defaults is no longer a builtin tool name

2013-02-21 Thread David Aguilar
On Wed, Feb 20, 2013 at 9:00 PM, Junio C Hamano gits...@pobox.com wrote: David Aguilar dav...@gmail.com writes: diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index fb00273..21fbba9 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -60,9 +60,9 @@ test_expect_success PERL

[PATCH v4 4/4] t7800: defaults is no longer a builtin tool name

2013-02-21 Thread David Aguilar
073678b8e6324a155fa99f40eee0637941a70a34 reworked the mergetools/ directory so that every file corresponds to a difftool-supported tool. When this happened the defaults file went away as it was no longer needed by mergetool--lib. t7800 tests that configured commands can override builtins, but

Re: [PATCH 2/2] format-patch: --inline-single

2013-02-21 Thread Junio C Hamano
Jeff King p...@peff.net writes: @@ -421,6 +443,9 @@ void pp_user_info(const struct pretty_print_context *pp, if (pp-mailmap) map_user(pp-mailmap, mailbuf, maillen, namebuf, namelen); +if (pp-inline_single is_current_user(pp, mailbuf, maillen, namebuf, namelen)) +

Re: [PATCH 2/2] format-patch: --inline-single

2013-02-21 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Jeff King p...@peff.net writes: @@ -421,6 +443,9 @@ void pp_user_info(const struct pretty_print_context *pp, if (pp-mailmap) map_user(pp-mailmap, mailbuf, maillen, namebuf, namelen); + if (pp-inline_single is_current_user(pp,

Re: [PATCH v4 4/4] t7800: defaults is no longer a builtin tool name

2013-02-21 Thread Junio C Hamano
Thanks. -- 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

-B option of git log

2013-02-21 Thread Eckhard Maass
Hello, As far as I understand the documentation, -B of git-log should help correct rename detection. But it does not seem to work for me. Let me get a setup: $ git init . Initialized empty Git repository in /tmp/t2/.git/ $ echo 'Lorem ipsum doler sed. Lorem ipsum doler sed. Lorem ipsum doler

Re: -B option of git log

2013-02-21 Thread Jeff King
On Fri, Feb 22, 2013 at 01:44:00AM +0100, Eckhard Maass wrote: Let me get a setup: $ git init . Initialized empty Git repository in /tmp/t2/.git/ $ echo 'Lorem ipsum doler sed. Lorem ipsum doler sed. Lorem ipsum doler sed. Lorem ipsum doler sed.' a $ git add a $ git commit -m 'Init.'

[PATCH] submodule update: when using recursion, show full path

2013-02-21 Thread Will Entriken
From d3fe2c76e6fa53e4cfa6f81600685c21bdadd4e3 Mon Sep 17 00:00:00 2001 From: William Entriken github@phor.net Date: Thu, 21 Feb 2013 23:10:07 -0500 Subject: [PATCH] submodule update: when using recursion, show full path Previously when using update with recursion, only the path for the

[PATCH] add: allow users to silence Git 2.0 warnings about add -u

2013-02-21 Thread David Aguilar
When git add -u is invoked from a subdirectory it prints a loud warning message about an upcoming Git 2.0 behavior change. Some users do not care to be warned. Accomodate them. The add.silence-pathless-warnings configuration variable can now be used to silence this warning. Signed-off-by: David

Re: [PATCH] add: allow users to silence Git 2.0 warnings about add -u

2013-02-21 Thread Junio C Hamano
David Aguilar dav...@gmail.com writes: When git add -u is invoked from a subdirectory it prints a loud warning message about an upcoming Git 2.0 behavior change. Some users do not care to be warned. Accomodate them. I do not think this is what we discussed to do. It was very much deliberate

Re: [PATCH] add: allow users to silence Git 2.0 warnings about add -u

2013-02-21 Thread David Aguilar
On Thu, Feb 21, 2013 at 10:23 PM, Junio C Hamano gits...@pobox.com wrote: David Aguilar dav...@gmail.com writes: When git add -u is invoked from a subdirectory it prints a loud warning message about an upcoming Git 2.0 behavior change. Some users do not care to be warned. Accomodate them.