Re: [PATCH v2 2/2] attr: more matching optimizations from .gitignore

2012-10-12 Thread Nguyen Thai Ngoc Duy
On Fri, Oct 12, 2012 at 12:09:57PM -0700, Junio C Hamano wrote: > This is not entirely your fault, but please don't do that "cd ..". > > The original test had "cd bare", made an assumption that step will > never fail (which is mostly correct), and ran everything afterward > in that subdirectory. >

[PATCH v2 2/2] git-cvsimport: allow local timezone for commits

2012-10-12 Thread Chris Rorvick
CVS patches are imported with the timezone offset of + (UTC). Allow timezone offsets to be calculated from the the local timezone by adding -l to the command line or specifying cvsimport.l in the config. This could be made the default behavior, as setting TZ=UTC in the environment before doing

[PATCH v2 1/2] git-cvsimport: use localtime for converting timestamps

2012-10-12 Thread Chris Rorvick
cvsps formats timestamps for the local timezone in its output. Using timegm() to convert to epoch-relative only works because cvsimport overrides TZ to "UTC". Using timelocal() does not change the behavior of the script as is, but it does ensure cvsimport behaves sanely if run with another TZ valu

[PATCH v2 0/2] git-cvsimport: support local timezone

2012-10-12 Thread Chris Rorvick
Changes to support local timezone offsets in imported commits. Modified documentation to clarify behavior of new -l option. Also, I split the original patch into two because using localtime()/timelocal() does not affect current functionality, but makes for sane results if someone monkeys with the

Re: [PATCH v4 00/12] Wildmatch v4

2012-10-12 Thread Nguyen Thai Ngoc Duy
On Fri, Oct 12, 2012 at 10:05:06AM -0700, Junio C Hamano wrote: > Nguyen, how about updating the match () shell function in 3070 so > that it not just says not-ok, but indicates what failed (wildmatch > failed, or wildmatch passed but fnmatch failed), at least when the > test is run as "./t3070-*.s

minor bug in git pull --rebase

2012-10-12 Thread Phil Hord
I saw some unexpected usage output today in git pull --rebase when I was on a detached head. $ git pull --rebase origin BL/3.0 usage: git merge-base [-a|--all] ... or: git merge-base [-a|--all] --octopus ... or: git merge-base --independent ... or: git merge-base --is-ancestor -a,

Re: "git am" crash (builtin/apply.c:2108) + small repro

2012-10-12 Thread Junio C Hamano
Nguyen Thai Ngoc Duy writes: > On Wed, Oct 3, 2012 at 10:44 PM, Alexey Spiridonov > wrote: >> Thanks a lot for trying this. >> >> My hashes match. I just re-reproduced it on two flavors of Linux (64 >> and 32-bit), with two different Git versions (see below). What >> platform are you using? > >

Re: [PATCH v4 00/12] Wildmatch v4

2012-10-12 Thread Torsten Bögershausen
On 10/12/2012 07:05 PM, Junio C Hamano wrote: Some problems even here (Mac OS) commit 2aeb6d4d7884f4c4425 not ok 61 - wildmatch 0 0 \ \ not ok 62 - wildmatch 0 0 /\ */\ not ok 69 - wildmatch 1 1 [ab] [[:]ab] not ok 71 - wildmatch 1 1 [ab] [[:digit]ab] not ok 80 - wildmatch 1 0 1 [[:digit:][:uppe

Re: [PATCH v2 2/2] attr: more matching optimizations from .gitignore

2012-10-12 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh > index 51f3045..4a1402f 100755 > --- a/t/t0003-attributes.sh > +++ b/t/t0003-attributes.sh > @@ -242,4 +242,18 @@ test_expect_success 'bare repository: test > info/attributes' ' > attr_check subdir/

Re: [PATCH v4 05/12] Integrate wildmatch to git

2012-10-12 Thread Junio C Hamano
Johannes Sixt writes: > --- >8 --- > From: Johannes Sixt > Subject: [PATCH] test-wildmatch: avoid exit code -1 > > Our bash on Windows does not recognize -1 as failure. > > Signed-off-by: Johannes Sixt > --- > Please squash this in, in the next round. I do think the patch is good, but I am cu

Re: filter-branch IO optimization

2012-10-12 Thread Jeff King
On Fri, Oct 12, 2012 at 04:49:54PM +0200, Enrico Weigelt wrote: > > The usual advice is "use an index-filter instead". It's *much* > > faster > > than a tree filter. However: > > I've tried the last example from git-filter-branch manpage, but failed. > Seems like the GIT_INDEX_FILE env variable

Re: filter-branch IO optimization

2012-10-12 Thread Enrico Weigelt
Hi folks, now finally managed the index-filter part. The main problem, IIRC, was that git-update-index didn't automatically create an empty index, so I needed to explicitly copy in (manually created it with an empty repo). My current filter code is: if [ ! "$GIT_AUTHOR_EMAIL" ] && [ ! "$GIT_COMM

Re: git fails: segfault at 0 ip 00000000004076d5 sp 00007fff7806ebc0

2012-10-12 Thread Jeff King
On Fri, Oct 12, 2012 at 06:34:30PM +0200, Erik Faye-Lund wrote: > > Thanks for reporting. I gave it a quick go, and the issue seems to > > also be present in the current 'master'. > > > > The problem is a NULL-pointer dereferencing introduced in 8809703 > > ("http: factor out http error code handl

Re: [PATCH v4 00/12] Wildmatch v4

2012-10-12 Thread Junio C Hamano
Torsten Bögershausen writes: > On 11.10.12 13:56, Nguyen Thai Ngoc Duy wrote: >> On Thu, Oct 11, 2012 at 11:33 AM, Junio C Hamano wrote: >>> Junio C Hamano writes: >>> Nguyễn Thái Ngọc Duy writes: > Really small updates. I did not want to resend it this soon but this > may f

Re: [PATCH v3] grep: stop looking at random places for .gitattributes

2012-10-12 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > grep searches for .gitattributes using "name" field in struct > grep_source but that field is not real on-disk path name. For example, > "grep pattern rev" fills the field with "rev:path", and Git looks for > .gitattributes in the (non-existent but exploitable) path

Re: [PATCH] http: fix segfault in handle_curl_result

2012-10-12 Thread Junio C Hamano
Jeff King writes: > When we create an http active_request_slot, we can set its > "results" pointer back to local storage. The http code will > fill in the details of how the request went, and we can > access those details even after the slot has been cleaned > up. > ... > However, I'm leaving tha

Re: [PATCH v4 00/12] Wildmatch v4

2012-10-12 Thread Torsten Bögershausen
On 11.10.12 13:56, Nguyen Thai Ngoc Duy wrote: > On Thu, Oct 11, 2012 at 11:33 AM, Junio C Hamano wrote: >> Junio C Hamano writes: >> >>> Nguyễn Thái Ngọc Duy writes: >>> Really small updates. I did not want to resend it this soon but this may fix the compile errors for Junio. >> >> t

Re: git fails: segfault at 0 ip 00000000004076d5 sp 00007fff7806ebc0

2012-10-12 Thread Erik Faye-Lund
On Fri, Oct 12, 2012 at 6:29 PM, Erik Faye-Lund wrote: > On Fri, Oct 12, 2012 at 6:58 AM, Brad Hein wrote: >> In Fedora 17 >> With git-1.7.11.7-1.fc17.x86_64 (rpm) >> >> I try to clone a particular repository but git just returns, having >> not cloned the repo. Seems like a bug. Details follow: >

Re: git fails: segfault at 0 ip 00000000004076d5 sp 00007fff7806ebc0

2012-10-12 Thread Erik Faye-Lund
On Fri, Oct 12, 2012 at 6:58 AM, Brad Hein wrote: > In Fedora 17 > With git-1.7.11.7-1.fc17.x86_64 (rpm) > > I try to clone a particular repository but git just returns, having > not cloned the repo. Seems like a bug. Details follow: > $ git clone http://gnuradio.org/git/gnuradio.git > > While t

Re: filter-branch IO optimization

2012-10-12 Thread Enrico Weigelt
Did some more experiments, and it seems that missing index file isn't automatically created. When I instead copy the original index file to the temporary location, it runs well. But I still have to wait for the final result to check whether it really overwrites the whole index or just adds new f

RE: A basic question - Thanks to all responders

2012-10-12 Thread Jim Vahl
Fellow developers, Thanks to all who responded to my “basic question”. I now have a much better idea (actually 2) of how releases can be documented when using git for version control. I appreciate your taking the time to help me on the learning path. Jim Vahl -- To unsubscribe from this list

Re: What's cooking in git.git (Oct 2012, #04; Thu, 11)

2012-10-12 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > On Fri, Oct 12, 2012 at 1:12 AM, Junio C Hamano wrote: > >> * jk/peel-ref (2012-10-04) 4 commits >> (merged to 'next' on 2012-10-08 at 4adfa2f) >> + upload-pack: use peel_ref for ref advertisements >> + peel_ref: check object type before loading >> + peel_r

Re: [PATCH] gitweb.cgi: fix "comitter_tz" typo in feed

2012-10-12 Thread Junio C Hamano
Dylan Alex Simon writes: > gitweb's feeds sometimes contained committer timestamps in the wrong timezone > due to a misspelling. > > Signed-off-by: Dylan Simon > --- This dates back to 6368d9f (gitweb: Always call parse_date with timezone parameter, 2011-03-19) which was in 1.7.4.2 and has been

Re: filter-branch IO optimization

2012-10-12 Thread Enrico Weigelt
Hi, > The usual advice is "use an index-filter instead". It's *much* > faster > than a tree filter. However: I've tried the last example from git-filter-branch manpage, but failed. Seems like the GIT_INDEX_FILE env variable doesnt get honoured by git-update-index, no index.new file created, and

Re: [PATCH v2 0/2] Re: gitk: can't reload commits with new key binding

2012-10-12 Thread Andrew Wong
Can I get some feedback on these two patches? It'd be great to have them merged into gitk. Thanks. On 10/02/2012 11:04 AM, Andrew Wong wrote: Refactored the code for binding modified function keys as Junio suggested. Andrew Wong (2): gitk: Refactor code for binding modified function keys

Re: [PATCH] git-gui: Few issues with using full path name

2012-10-12 Thread Andrew Wong
Can I get some feedback on these two patches? It'd be great to have them merged into git-gui. Thanks. On 10/02/2012 12:25 PM, Andrew Wong wrote: I ran into a file name parsing issue in git-gui. If I'm in a subfolder and try to pass a full path to "git-gui blame", then "git-gui" will fail to de

Re: [PATCH 2/2] http: do not set up curl auth after a 401

2012-10-12 Thread Brad Hein
Nice work sorting this out. I don't see the commit on github (https://github.com/git/git/commits/master) yet but once the code is available I'll be happy to re-test if needed. On Fri, Oct 12, 2012 at 3:35 AM, Jeff King wrote: > When we get an http 401, we prompt for credentials and put > them in

[ANNOUNCE] tig-1.1

2012-10-12 Thread Jonas Fonseca
Hello, I've release tig version 1.1 with a bunch of improvements and bug fixes. Note that tig no longer uses move/copy detection by default to work better on large repository. See the release notes below on how to restore the old behavior. What is tig? Tig is an ncurses-based text-mo

[PATCH v3] grep: stop looking at random places for .gitattributes

2012-10-12 Thread Nguyễn Thái Ngọc Duy
grep searches for .gitattributes using "name" field in struct grep_source but that field is not real on-disk path name. For example, "grep pattern rev" fills the field with "rev:path", and Git looks for .gitattributes in the (non-existent but exploitable) path "rev:path" instead of "path". This pa

Re: [PATCH v2 2/2] attr: more matching optimizations from .gitignore

2012-10-12 Thread Nguyen Thai Ngoc Duy
On Thu, Oct 11, 2012 at 3:03 AM, Junio C Hamano wrote: > It would save time from both of us if you can check what is queued > on 'pu'. I do not think I touched the code for off-by-one bugs > there, though. 'pu' looks good. -- Duy -- To unsubscribe from this list: send the line "unsubscribe git"

Re: [PATCH v4 12/12] t3070: disable two fnmatch tests that have different results on different libc

2012-10-12 Thread Nguyen Thai Ngoc Duy
On Fri, Oct 12, 2012 at 2:22 PM, Johannes Sixt wrote: > Am 10/10/2012 12:40, schrieb Nguyễn Thái Ngọc Duy: >> fnmatch on glibc-2.12.1 returns no match. glibc-2.15 returns ok. > > There are many more cases that fail with the fnmatch() that we ship in > compat/fnmatch. To test this on Linux, you hav

Re: [PATCH] git-cvsimport: support local timezone

2012-10-12 Thread Michael Haggerty
On 10/12/2012 02:14 AM, Christopher Rorvick wrote: > On Thu, Oct 11, 2012 at 5:43 PM, Michael Haggerty > wrote: >> On 10/11/2012 10:48 PM, Chris Rorvick wrote: >>> CVS patches are unconditionally imported with a UTC timezone. Allow >>> the local timezone by adding -l to the command line or speci

Re: How can I tell if anything was fetched?

2012-10-12 Thread Jeff King
On Thu, Oct 11, 2012 at 06:45:09PM +0200, Andreas Schwab wrote: > Phil Lawrence writes: > > > One approach might be to first generate a state-of-the-repo SHA1: > > # http://stackoverflow.com/a/7350019/834039 > > # http://git-scm.com/book/ch9-2.html > > { > > git rev-list --ob

Re: What's cooking in git.git (Oct 2012, #04; Thu, 11)

2012-10-12 Thread Ævar Arnfjörð Bjarmason
On Fri, Oct 12, 2012 at 1:12 AM, Junio C Hamano wrote: > * jk/peel-ref (2012-10-04) 4 commits > (merged to 'next' on 2012-10-08 at 4adfa2f) > + upload-pack: use peel_ref for ref advertisements > + peel_ref: check object type before loading > + peel_ref: do not return a null sha1 > + peel_re

[PATCH 2/2] http: do not set up curl auth after a 401

2012-10-12 Thread Jeff King
When we get an http 401, we prompt for credentials and put them in our global credential struct. We also feed them to the curl handle that produced the 401, with the intent that they will be used on a retry. When the code was originally introduced in commit 42653c0, this was a necessary step. Howe

[PATCH 1/2] remote-curl: do not call run_slot repeatedly

2012-10-12 Thread Jeff King
Commit b81401c (http: prompt for credentials on failed POST) taught post_rpc to call run_slot in a loop in order to retry a request after asking the user for credentials. However, after a call to run_slot we will have called finish_active_slot. This means we have released the slot, and we should no

Re: [PATCH v2 2/2] grep: stop looking at random places for .gitattributes

2012-10-12 Thread Johannes Sixt
Am 10/11/2012 17:51, schrieb Junio C Hamano: > Johannes Sixt writes: > >> I saw EINVAL errors when 'git grep pattern rev' was run on Windows. The >> reason is that the code attempted to access "rev:dir/.gitattributes" in >> the worktree, which is an invalid path on Windows due to the colon. The >

Re: [PATCH] http: fix segfault in handle_curl_result

2012-10-12 Thread Jeff King
On Fri, Oct 12, 2012 at 02:22:49AM -0400, Jeff King wrote: > We should probably not be passing the slot to handle_curl_results at > all, since it may have already been reused and is not safe to read. The > only thing we do with it is to set up any new auth information in the > curl handle. This d

Re: [PATCH v4 05/12] Integrate wildmatch to git

2012-10-12 Thread Johannes Sixt
--- >8 --- From: Johannes Sixt Subject: [PATCH] test-wildmatch: avoid exit code -1 Our bash on Windows does not recognize -1 as failure. Signed-off-by: Johannes Sixt --- Please squash this in, in the next round. test-wildmatch.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) di

Re: [PATCH v4 12/12] t3070: disable two fnmatch tests that have different results on different libc

2012-10-12 Thread Johannes Sixt
Am 10/10/2012 12:40, schrieb Nguyễn Thái Ngọc Duy: > fnmatch on glibc-2.12.1 returns no match. glibc-2.15 returns ok. There are many more cases that fail with the fnmatch() that we ship in compat/fnmatch. To test this on Linux, you have to remove the "#if defined _LIBC || !defined __GNU_LIBRARY__"