[ANNOUNCE] Git v2.3.1

2015-02-24 Thread Junio C Hamano
The latest maintenance release Git v2.3.1 is now available at the usual places. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/ The following public repositories all have a copy of the 'v2.3.1' tag and the 'maint' branch that the tag points at: url = git://repo.or.

Re: Any chance for a Git v2.1.5 release?

2015-02-24 Thread Junio C Hamano
"Kyle J. McKay" writes: >> I can designate ;-), but I do not think I'd be the right person to >> maintain or long-term-support it. Are you volunteering to oversee >> the "LTS team"? > > I could not promise a team of more than one member. And that would > not be full-time 24/7 either. Heh. Maki

Re: [BUG] diffcore-rename with duplicate tree entries can segfault

2015-02-24 Thread Junio C Hamano
Jeff King writes: > 3. The sort order check is wrong. :-/ It needs to take into account > git's magic "if it's a tree, pretend it has '/' after it" rule. > That's not too hard for a single tree (fsck.c:verify_ordered does > it). But for filepairs, I'm not sure what to do. Most ca

Re: Any chance for a Git v2.1.5 release?

2015-02-24 Thread Kyle J. McKay
On Feb 24, 2015, at 11:52, Junio C Hamano wrote: Kyle J. McKay writes: Which brings us back to the subject of this email, is there any chance for a v2.1.5 release? ... It appears that the average support lifespan of a Git release from initial release date through last released maintenance u

Re: [ANNOUNCE] Git Merge Contributors Summit, April 8th, Paris

2015-02-24 Thread Stefan Beller
On Tue, Feb 24, 2015 at 2:09 PM, Jeff King wrote: > > 2. Get people thinking about what they would like to talk about. In > past GitTogethers, it's been a mix of people with prepared things > to talk about, group discussions of areas, and general kibitzing. > We can be spontaneou

Re: [msysGit] Re: [RFH] GSoC 2015 application

2015-02-24 Thread Stefan Beller
On Tue, Feb 24, 2015 at 3:56 PM, Matthieu Moy wrote: > Johannes Schindelin writes: > >> Hi Junio, >> >> On 2015-02-24 19:25, Junio C Hamano wrote: >>> On Tue, Feb 24, 2015 at 9:32 AM, Matthieu Moy >>> wrote: About the proposal: The idea of this project is to dive into the Git so

Re: [msysGit] Re: [RFH] GSoC 2015 application

2015-02-24 Thread Matthieu Moy
Johannes Schindelin writes: > Hi Junio, > > On 2015-02-24 19:25, Junio C Hamano wrote: >> On Tue, Feb 24, 2015 at 9:32 AM, Matthieu Moy >> wrote: >>> About the proposal: >>> >>> The idea of this project is to dive into the Git source code and >>> convert, say, git-add--interactive.perl and/o

Re: [BUG] diffcore-rename with duplicate tree entries can segfault

2015-02-24 Thread Jeff King
On Tue, Feb 24, 2015 at 03:11:00PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > I'm assuming there _is_ a sane sort order. We have two halves of a > > filepair, but I think before any of the rename or break detection kicks > > in, each pair should either: > > > > 1. Have a name in pa

Re: [RFC/PATCH 0/3] protocol v2

2015-02-24 Thread Stefan Beller
On Mon, Feb 23, 2015 at 10:15 PM, Junio C Hamano wrote: > On Mon, Feb 23, 2015 at 8:02 PM, Duy Nguyen wrote: >> >> It's very hard to keep backward compatibility if you want to stop the >> initial ref adverstisement, costly when there are lots of refs. But we >> can let both protocols run in paral

Re: [BUG] diffcore-rename with duplicate tree entries can segfault

2015-02-24 Thread Junio C Hamano
Jeff King writes: > I'm assuming there _is_ a sane sort order. We have two halves of a > filepair, but I think before any of the rename or break detection kicks > in, each pair should either: > > 1. Have a name in pair->one, and an invalid filespec in pair->two > (i.e., a deletion). > >

Re: [BUG] diffcore-rename with duplicate tree entries can segfault

2015-02-24 Thread Jeff King
On Tue, Feb 24, 2015 at 02:42:42PM -0800, Junio C Hamano wrote: > > That does fix this problem, and it doesn't break any other tests. But > > frankly, I don't know what I'm doing and this feels like a giant hack. > > > > Given that this is tangentially related to the "-B -M" stuff you've been > >

Re: [BUG] diffcore-rename with duplicate tree entries can segfault

2015-02-24 Thread Junio C Hamano
Jeff King writes: > I ran across a real-world case where git segfaults on some trees that > have duplicate entries. Those trees are obviously broken, and I'm fine > with us producing whatever output we like on them. But probably we > shouldn't segfault. Thanks. > ... > That does fix this proble

Re: [ANNOUNCE] Git Merge Contributors Summit, April 8th, Paris

2015-02-24 Thread Junio C Hamano
Jeff King writes: > I wanted to make one more announcement about this, since a few more > details have been posted at: > > http://git-merge.com/ > > since my last announcement. Specifically, I wanted to call attention to > the contributor's summit on the 8th. Basically, there will be a space >

Re: gc.linkedobjectdir discussion

2015-02-24 Thread Junio C Hamano
Will Entriken writes: > USAGE - CACHE HIT: > During another pull or clone on a different working directory, git > will find the required object in LINKEDOBJECTDIR and hard link into > the active repo's object store. What happens when the necessary objects are in a packfile, mixed with other obje

Re: Copyright on wildmatch.c

2015-02-24 Thread Jim Meyering
On Tue, Feb 24, 2015 at 4:34 AM, Guilherme wrote: > This is just an email to all the people i have written in private > about relicensing the files in need in TSS so they can reply to this > email and it be recorded in the mailing list. > > The files are part of ctypes.c hex.c git-compat-util.h. >

[ANNOUNCE] Git Merge Contributors Summit, April 8th, Paris

2015-02-24 Thread Jeff King
I wanted to make one more announcement about this, since a few more details have been posted at: http://git-merge.com/ since my last announcement. Specifically, I wanted to call attention to the contributor's summit on the 8th. Basically, there will be a space that can hold up to 50 people, it'

Re: [PATCH 1/2] clone: add disassociate alias to dissociate option

2015-02-24 Thread Michael Haggerty
On 02/24/2015 09:06 PM, Junio C Hamano wrote: > Michael Haggerty writes: >> By the way, once we have stopped thinking about this feature as >> "--reference" and then "--dissociate", it becomes obvious that a nice >> generalization would be to allow *any* repository (including remote >> ones) to se

gc.linkedobjectdir discussion

2015-02-24 Thread Will Entriken
Hello, This post presents an idea for storing git objects into a hard-linked shared directory which would allow performance gains and safety so that users can set it and forget it. SETUP: Users run `git config --global gc.linkedobjectdir ~/.gitsharedobjects` USAGE - CACHE MISS: During a pull, gi

Re: assistance with git error

2015-02-24 Thread Jeff King
On Tue, Feb 24, 2015 at 04:49:00PM -0500, Thomas Moretto wrote: > i also have a question concerning large files. Sure, but let's take it back on-list. Then other people can help answer, and later users can benefit from seeing the answers. > i ran a check and it said there was a schema.sql file t

[BUG] diffcore-rename with duplicate tree entries can segfault

2015-02-24 Thread Jeff King
I ran across a real-world case where git segfaults on some trees that have duplicate entries. Those trees are obviously broken, and I'm fine with us producing whatever output we like on them. But probably we shouldn't segfault. Basically what happens is that the rename_dst array maps paths to diff

Re: assistance with git error

2015-02-24 Thread Jeff King
On Tue, Feb 24, 2015 at 08:40:56PM +, Tom wrote: > Could someone provide me some assistance with troubleshooting the following: > > remote: Counting objects: 31654, done. > error: pack-objects died of signal 99568/19585) The output is smushed here due to the use of "\r" for the progress r

Re: [PATCH v3] remote-curl: fall back to Basic auth if Negotiate fails

2015-02-24 Thread Dan Langille (dalangil)
> On Feb 19, 2015, at 3:35 PM, brian m. carlson > wrote: > > On Wed, Feb 18, 2015 at 04:17:46PM +, Dan Langille (dalangil) wrote: >> I just built from ‘master’, on FreeBSD 9.3: >> >> cd ~/src >> git clone https://github.com/git/git.git >> cd git >> gmake >> >> Then tried ~/src/git/git clon

Re: [RFH] GSoC 2015 application

2015-02-24 Thread Junio C Hamano
Johannes Schindelin writes: >> Also drop "proper" as if scripted Porcelains are second class citizens ;-) > > If you had to deal with the portability/performance issues of the > shell scripts I am frequently faced with, you would not call them > first class citizens, either. Perhaps that might b

assistance with git error

2015-02-24 Thread Tom
Could someone provide me some assistance with troubleshooting the following: remote: Counting objects: 31654, done. error: pack-objects died of signal 99568/19585) error: git upload-pack: git-pack-objects died with error. fatal: git upload-pack: aborting due to possible repository corruption on

Re: [msysGit] Re: [RFH] GSoC 2015 application

2015-02-24 Thread Johannes Schindelin
Hi Junio, On 2015-02-24 19:25, Junio C Hamano wrote: > On Tue, Feb 24, 2015 at 9:32 AM, Matthieu Moy > wrote: >> About the proposal: >> >> The idea of this project is to dive into the Git source code and >> convert, say, git-add--interactive.perl and/or git stash into proper C >> code, maki

Re: Internationalization and yes/no prompts

2015-02-24 Thread Junio C Hamano
Pierre-Olivier Vares writes: > /Supprimer //premier_fichier ? [Remove first_file ?]/ > Natural answer to this question is 'Oui' [Yes], so I type 'o', rather > than 'y'. > Once finished, I see no file has been removed (since 'o' has been > considered as 'different than yes') > Whereas it's not an

Re: [PATCH 1/2] clone: add disassociate alias to dissociate option

2015-02-24 Thread Junio C Hamano
Michael Haggerty writes: > On 02/22/2015 07:32 PM, Junio C Hamano wrote: >> ... Both borrow the objects >> in order to reduce the network cost, and the difference is that one >> keeps borrowing while the other one limits the borrowing to strictly >> the initial phase. The two words, "borrow" an

Import git log into a spreadsheet

2015-02-24 Thread Phillip Susi
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 I'm trying to import a git log into a spreadsheet. I used a simple - --pretty=format: switch to select the fields I wanted and separate them with commas to generate a CSV file that can be imported. The message body, however, is presenting a problem.

Re: Import git log into a spreadsheet

2015-02-24 Thread Junio C Hamano
Phillip Susi writes: > I'm trying to import a git log into a spreadsheet. I used a simple > --pretty=format: switch to select the fields I wanted and separate > them with commas to generate a CSV file that can be imported. The > message body, however, is presenting a problem. The first problem

Re: Build error with current source release

2015-02-24 Thread Junio C Hamano
"J. R. Westmoreland" writes: > I/O error : Attempt to load network entity > http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd > /Users/jr/Documents/projects/git/Documentation/git-add.xml:2: warning: failed > to load external entity > "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd

Re: Copyright on wildmatch.c

2015-02-24 Thread Junio C Hamano
Guilherme writes: > I'm not sure on how i would rewrite hex.c it is just an array. > > From git-compat-util.h i only needed a subset of the file (Lines 699 > to 785), as you assumed, but rewriting it also seems pointless as it > is only a few defines and 4 very short functions. I do not think I

Re: Build error with current source release

2015-02-24 Thread Dan Johnson
On Tue, Feb 24, 2015 at 9:23 AM, J. R. Westmoreland wrote: > Hi > > I hope it is okay to ask such a question here. > > I cloned the current source tree and tried to build it and I get the > following error. > Could someone tell me why and if there is an easy way to fix it? > I’m running on a Mac

Re: [PATCH] sequencer: preserve commit messages

2015-02-24 Thread Junio C Hamano
Michael J Gruber writes: >> Hmm, wouldn't it introduce a grave regression for users who >> explicitly ask to clean crufty messages up (by setting their own >> commit.cleanup configuration) if you unconditionally force >> "--cleanup=verbatim" here? >> > > That's what I meant by possible side-effe

Re: [msysGit] Re: [RFH] GSoC 2015 application

2015-02-24 Thread Junio C Hamano
On Tue, Feb 24, 2015 at 9:32 AM, Matthieu Moy wrote: > About the proposal: > > The idea of this project is to dive into the Git source code and > convert, say, git-add--interactive.perl and/or git stash into proper C > code, making it a so-called "built-in". > > My advice would be to try con

Re: [msysGit] Re: [RFH] GSoC 2015 application

2015-02-24 Thread Matthieu Moy
Johannes Schindelin writes: > After considerable consideration, I am offering to mentor > Windows-related projects (into which I count conversion of scripts > into builtins). Good news! About the proposal: The idea of this project is to dive into the Git source code and convert, say, git-a

Re: Copyright on wildmatch.c

2015-02-24 Thread René Scharfe
Am 24.02.2015 um 13:34 schrieb Guilherme: This is just an email to all the people i have written in private about relicensing the files in need in TSS so they can reply to this email and it be recorded in the mailing list. The files are part of ctypes.c hex.c git-compat-util.h. On Tue, Feb 24,

[bug?] renamed file loses changes in merge.

2015-02-24 Thread Mauro Condarelli
I'm unsure it is a bug or a misuse on my part, but: Situation: There are two distinct repositories (upstream & local), local is a fork of upstream (at tag "v3.7"). Both repositories were modified (upstream has delivered new version with tag "v3.7.1"). I need to incorporate local changes into t

Re: [PATCH 1/4] parse-options: introduce OPT_PATH

2015-02-24 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 23.02.2015 20:23: > Michael J Gruber writes: > >> Many options are paths, but not files. Introduce OPT_PATH which does >> the same path processing as OPT_FILENAME but allows to name the argument. >> ... >> diff --git a/parse-options.h b/parse-options.h >> index

Re: [PATCH] sequencer: preserve commit messages

2015-02-24 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 23.02.2015 19:54: > Michael J Gruber writes: > >> sequencer calls "commit" with default options, which implies >> "--cleanup=default" unless the user specified something else in their >> config. This leads to cherry-picked commits getting a cleaned up commit >>

Build error with current source release

2015-02-24 Thread J. R. Westmoreland
Hi I hope it is okay to ask such a question here. I cloned the current source tree and tried to build it and I get the following error. Could someone tell me why and if there is an easy way to fix it? I’m running on a Mac and everything ran fine up to this error. Is is an excerpt from my types

Re: Copyright on wildmatch.c

2015-02-24 Thread Anthony Ramine
I agree to relicense my contributions on wildmatch.c under the Apache license. Le 24 févr. 2015 à 13:54, Guilherme a écrit : > This is CC to Anthony Ramine. > > On Tue, Feb 24, 2015 at 1:34 PM, Guilherme wrote: >> This is just an email to all the people i have written in private >> about relic

Re: Copyright on wildmatch.c

2015-02-24 Thread Guilherme
This is CC to Anthony Ramine. On Tue, Feb 24, 2015 at 1:34 PM, Guilherme wrote: > This is just an email to all the people i have written in private > about relicensing the files in need in TSS so they can reply to this > email and it be recorded in the mailing list. > > The files are part of ctyp

Re: Git Scaling: What factors most affect Git performance for a large repo?

2015-02-24 Thread Michael Haggerty
On 02/20/2015 03:25 PM, Ævar Arnfjörð Bjarmason wrote: > On Fri, Feb 20, 2015 at 1:09 PM, Ævar Arnfjörð Bjarmason > wrote: >> On Fri, Feb 20, 2015 at 1:04 AM, Duy Nguyen wrote: >>> On Fri, Feb 20, 2015 at 6:29 AM, Ævar Arnfjörð Bjarmason >>> wrote: Anecdotally I work on a repo at work (wher

Re: Copyright on wildmatch.c

2015-02-24 Thread Guilherme
This is just an email to all the people i have written in private about relicensing the files in need in TSS so they can reply to this email and it be recorded in the mailing list. The files are part of ctypes.c hex.c git-compat-util.h. On Tue, Feb 24, 2015 at 1:22 PM, Guilherme wrote: > Hello,

Re: [msysGit] Re: [RFH] GSoC 2015 application

2015-02-24 Thread Jeff King
On Tue, Feb 24, 2015 at 01:25:32PM +0100, Johannes Schindelin wrote: > > Thanks! No rush, as we are not even accepted yet, but you can create a > > profile at: > > > > http://google-melange.com > > > > and ask to join the "git" project as a mentor. > > I guess I can only ask that after the or

Re: [msysGit] Re: [RFH] GSoC 2015 application

2015-02-24 Thread Johannes Schindelin
Hi Peff, On 2015-02-24 13:06, Jeff King wrote: > On Tue, Feb 24, 2015 at 01:01:17PM +0100, Johannes Schindelin wrote: > >> After considerable consideration, I am offering to mentor >> Windows-related projects (into which I count conversion of scripts >> into builtins). > > Thanks! No rush, as we

Re: Copyright on wildmatch.c

2015-02-24 Thread Guilherme
Hello, I'm writing to you in regards to the files ctypes.c which you have modified part of in the git project. I'm currently working on integrating gitignore pattern matching into the_sivler_searcher(http://github.com/ggreer/the_silver_searcher). PR https://github.com/ggreer/the_silver_searcher/p

Re: Copyright on wildmatch.c

2015-02-24 Thread Guilherme
I'm not sure on how i would rewrite hex.c it is just an array. >From git-compat-util.h i only needed a subset of the file (Lines 699 to 785), as you assumed, but rewriting it also seems pointless as it is only a few defines and 4 very short functions. I have asked everybody who changed anything i

Re: [msysGit] Re: [RFH] GSoC 2015 application

2015-02-24 Thread Jeff King
On Tue, Feb 24, 2015 at 01:01:17PM +0100, Johannes Schindelin wrote: > After considerable consideration, I am offering to mentor > Windows-related projects (into which I count conversion of scripts > into builtins). Thanks! No rush, as we are not even accepted yet, but you can create a profile at

Re: [msysGit] Re: [RFH] GSoC 2015 application

2015-02-24 Thread Johannes Schindelin
Hi Peff, On 2015-02-18 20:32, Jeff King wrote: > On Wed, Feb 18, 2015 at 02:14:17PM -0500, Jeff King wrote: > >> The response to my previous email was not overwhelming, but people did >> express some interest in Git doing GSoC this year. So I've started on >> the application, using last year's v

Re: Copyright on wildmatch.c

2015-02-24 Thread Duy Nguyen
On Tue, Feb 24, 2015 at 4:29 PM, Guilherme wrote: > That discussion seems to have just died off. > > Whom should i write to about making the license change effective? You > (Duy Nguyen) seemed to be fine with the license change. Can you, or > anyone else, further guide me on the process on making

Re: Question on shallow clones.

2015-02-24 Thread Duy Nguyen
On Fri, Feb 20, 2015 at 9:13 PM, Alfred Perlstein wrote: > Hello, > > Very sorry if this has been explained before, I have been doing research past > few weeks in spare time and have not found a good answer yet on the safety of > doing something with git. > > Basically we have some repos with hu

Re: Copyright on wildmatch.c

2015-02-24 Thread Guilherme
That discussion seems to have just died off. Whom should i write to about making the license change effective? You (Duy Nguyen) seemed to be fine with the license change. Can you, or anyone else, further guide me on the process on making sure i can use the file(s) in TSS? Thank you. On Tue, Feb

Verify Your Account!!!

2015-02-24 Thread HELPDESK
Dear User, We are undergoing maintenance so that all accounts should be updated, this is to reduce the number of dormant accounts. Accounts not updated will be suspended within 48 hours. Follow the hypertext link below to update your account Click to verify account. http://helpdesk0.bmota.in

Re: [PATCH 1/2] clone: add disassociate alias to dissociate option

2015-02-24 Thread Michael Haggerty
On 02/22/2015 07:32 PM, Junio C Hamano wrote: > Jeff King writes: > >> I wonder if there is some better word that could become a synonym for >> "--reference --dissociate". Maybe "--borrow", but that does not >> necessarily carry the implication that the relationship ends as soon as >> the clone i

Re: Copyright on wildmatch.c

2015-02-24 Thread Duy Nguyen
On Tue, Feb 24, 2015 at 3:08 PM, Guilherme wrote: > Hello, > > I have already posted this to the users mailing list but i guess it's > more appropriate to have it here. Related thread about relicensing wildmatch.c for tss http://thread.gmane.org/gmane.comp.version-control.git/259764/focus=259798

Fwd: Copyright on wildmatch.c

2015-02-24 Thread Guilherme
Hello, I have already posted this to the users mailing list but i guess it's more appropriate to have it here. -- Forwarded message -- From: Guilherme Date: Tue, Feb 24, 2015 at 9:02 AM Subject: Copyright on wildmatch.c To: "git-us...@googlegroups.com" Hello, I'm trying to im