Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Ramkumar Ramachandra
Thomas Rast wrote: > Ramkumar Ramachandra writes: > > [...] On a related note, I don't like our Wiki. It's down half the time, and it's very badly maintained. I want to write content for our Wiki from the comfort of my editor, with version control aiding me. And I can't stan

Re: [ANNOUNCE] Git v1.8.2-rc0

2013-02-18 Thread Matthieu Moy
Junio C Hamano writes: > +At Git 2.0 (not *this* one), we > +plan to change these commands without pathspec to operate on the > +entire tree, and training your fingers to type "." will protect you > +against the future change. My understanding of the plan was more to forbid argumentless git -u|-

Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Junio C Hamano
Ramkumar Ramachandra writes: > Junio C Hamano wrote: > ... >> I think the real issue is everybody in the GSoC mentor candidate >> pool grossly underestimates the scope of suggested projects, does >> not encourage students to send early drafts to the public from the >> beginning, and perhaps overe

Re: [PATCH 4/4] Documentation/git-commit.txt: correct a few minor grammatical mistakes

2013-02-18 Thread Jonathan Nieder
Brandon Casey wrote: > Hmm, I think the original text was more confusing than I realized. I > think we should reorder the cleanup modes, placing "default" last, and > then describe default in terms of either strip or whitespace depending > on whether an editor will be spawned. Sounds good to me.

Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Jonathan Nieder
Ramkumar Ramachandra wrote: > The short undiplomatic version of that is that our mentors suck (I'm > not pointing fingers, but that's what I infer from failing projects). Hold on a second. I'm not remembering such a grim outcome with 100% failure from prior summers of code as you're describing.

Re: [PATCH 4/4] Documentation/git-commit.txt: correct a few minor grammatical mistakes

2013-02-18 Thread Brandon Casey
On Mon, Feb 18, 2013 at 10:43 PM, Jonathan Nieder wrote: > Brandon Casey wrote: > >> --- a/Documentation/git-commit.txt >> +++ b/Documentation/git-commit.txt >> @@ -174,10 +174,10 @@ OPTIONS >> --cleanup=:: >> This option sets how the commit message is cleaned up. >> The '' can be on

Re: [PATCH 4/4] Documentation/git-commit.txt: correct a few minor grammatical mistakes

2013-02-18 Thread Jonathan Nieder
Brandon Casey wrote: > --- a/Documentation/git-commit.txt > +++ b/Documentation/git-commit.txt > @@ -174,10 +174,10 @@ OPTIONS > --cleanup=:: > This option sets how the commit message is cleaned up. > The '' can be one of 'verbatim', 'whitespace', 'strip', > - and 'default'. The

Re: [PATCH 3/4] git-commit: only append a newline to -m mesg if necessary

2013-02-18 Thread Jonathan Nieder
Brandon Casey wrote: > Currently, git will append two newlines to every message supplied via > the -m switch. The purpose of this is to allow -m to be supplied > multiple times and have each supplied string become a paragraph in the > resulting commit message. > > Normally, this does not cause a

Git 1.8.2 l10n round 3

2013-02-18 Thread Jiang Xin
Hi, Leaders of Git language teams please note that a new "git.pot" is generated from v1.8.2-rc0-16-g20a59 in the master branch. See commit: l10n: git.pot: v1.8.2 round 3 (5 new) Generate po/git.pot from v1.8.2-rc0-16-g20a59 for git v1.8.2 l10n round 3. Signed-off-by: Jiang Xin

Re: [PATCH 2/4] t7502: demonstrate breakage with a commit message with trailing newlines

2013-02-18 Thread Jonathan Nieder
Brandon Casey wrote: > This test attempts to verify that a commit message supplied to 'git > commit' via the -m switch was used in full as the commit message for a > commit when --cleanup=verbatim was used. [...] > The test was able to complete successfully since internally, git appends > two newl

[BUG] git-check-ignore: Segmentation fault

2013-02-18 Thread Zoltan Klinger
Hi there, The new git-check-ignore command seg faults when (1) it is called with single dot path name at $GIT_DIR level _AND_ (2) and .gitignore has at least one directory pattern. Git version: 1.8.2.rc0.16.g20a599e Reproduce the bug: $ git --version git version 1.8.2.rc0.16.g20

Re: [PATCH 1/4] t/t7502: compare entire commit message with what was expected

2013-02-18 Thread Jonathan Nieder
Jonathan Nieder wrote: > +++ w/t/t7502-commit.sh [...] > + # Please enter the commit message for your changes. Lines > starting > + # with '\''#'\'' will be kept; you may remove them yourself if > you want to. > + # An empty message aborts the commit. > +

Re: [PATCH 1/4] t/t7502: compare entire commit message with what was expected

2013-02-18 Thread Jonathan Nieder
Brandon Casey wrote: > So, let's use the --no-status option to 'git commit' which will cause > git to refrain from appending the lines of instructional text to the > commit message. This will allow the entire resulting commit message to > be compared against the expected value. The downside (not

[PATCH 4/4] Documentation/git-commit.txt: correct a few minor grammatical mistakes

2013-02-18 Thread Brandon Casey
Signed-off-by: Brandon Casey --- Documentation/git-commit.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 0eb79cc..8ae7619 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @

[PATCH 2/4] t7502: demonstrate breakage with a commit message with trailing newlines

2013-02-18 Thread Brandon Casey
This test attempts to verify that a commit message supplied to 'git commit' via the -m switch was used in full as the commit message for a commit when --cleanup=verbatim was used. But, this test has been broken since it was introduced. Since the commit message containing trailing newlines was sup

[PATCH 3/4] git-commit: only append a newline to -m mesg if necessary

2013-02-18 Thread Brandon Casey
Currently, git will append two newlines to every message supplied via the -m switch. The purpose of this is to allow -m to be supplied multiple times and have each supplied string become a paragraph in the resulting commit message. Normally, this does not cause a problem since any trailing newlin

[PATCH 1/4] t/t7502: compare entire commit message with what was expected

2013-02-18 Thread Brandon Casey
This test attempts to verify that a commit in "verbatim" mode, when supplied a commit template, produces a commit in which the commit message matches exactly the template that was supplied. But, since the commit operation appends additional instructions for the user as comments in the commit buffe

Re: feature request

2013-02-18 Thread Drew Northup
On Mon, Feb 18, 2013 at 3:45 PM, Jeff King wrote: > On Mon, Feb 18, 2013 at 02:54:30PM -0500, James Nylen wrote: >> > Just would like to request a security feature to help secure peoples github >> > accounts more by supporting 2 factor authentication like the yubikey more >> > information can be f

git-p4: Importing a Git repository into Perforce without rebasing

2013-02-18 Thread Russell Myers
Hello, I'm trying to take a Git repository which has never been in Perforce and push it to Perforce and having difficulty. It would appear that git-p4 requires that a repository is cloned using "git p4 clone" in order to use it to push back to Perforce. That would not be the case here as the repo

Re: Potential GSoC13 projects (Re: Google Summer of Code 2013 (GSoC13))

2013-02-18 Thread Duy Nguyen
On Tue, Feb 19, 2013 at 4:11 AM, Jonathan Nieder wrote: > Ramkumar Ramachandra wrote: >> Jonathan Nieder wrote: > >>> - cross-compilable git >> >> Why, exactly? Git for embedded devices? > > My personal motivation would be building Git for Windows while > spending as little time on Windows as po

Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Duy Nguyen
On Tue, Feb 19, 2013 at 12:23 AM, Thomas Rast wrote: > * Naturally that ideas page is a bit stale now, and three projects > shorter. Please propose new ideas and refresh or delete the old ones! > In particular some projects spawned long discussions on the list, and > the results of those di

Re: [ANNOUNCE] Git v1.8.2-rc0

2013-02-18 Thread Junio C Hamano
Junio C Hamano writes: >> I don't understand: wasn't this supposed to happen in Git 2.0? Did you >> mean "In the upcoming major release (tentatively called *2.0*)"? > > Thanks. I am not sure what I was thinking. Perhaps when we started > this cycle we did want to merge the push-2.0-default-to-s

Re: [PATCH v2] shell-prompt: clean up nested if-then

2013-02-18 Thread Jonathan Nieder
Martin Erik Werner wrote: > Minor clean up of if-then nesting in checks for environment variables > and config options. No functional changes. > > Signed-off-by: Martin Erik Werner > --- > contrib/completion/git-prompt.sh | 27 +-- > 1 file changed, 13 insertions(+), 14

Re: [ANNOUNCE] Git v1.8.2-rc0

2013-02-18 Thread Junio C Hamano
Matthieu Moy writes: > Junio C Hamano writes: > >> Git v1.8.2 Release Notes (draft) >> >> >> Backward compatibility notes >> >> >> In the upcoming major release (tentatively called 1.8.2), we will >> change the behavior of the "git push" comm

Re: [PATCH] shell-prompt: clean up nested if-then

2013-02-18 Thread Junio C Hamano
Martin Erik Werner writes: > On Mon, 2013-02-18 at 21:31 +0100, Simon vanaf Telefoon wrote: >> Hi all, sorry for top posting :-( blame the phone and k9 >> >> I have a small issue with the use of test instead of [ >> If that only applies to this section of the entire file. >> Coding style has so

Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Jonathan Nieder
Jeff King wrote: > On Mon, Feb 18, 2013 at 11:34:24AM -0800, Jonathan Nieder wrote: >> Some potential projects (unfiltered --- please take them with a grain >> of salt): >> [...] >> - collaborative notes editing: fix the default notes refspec, >>make sure the "notes pull" workflow works well

[PATCH v2] shell-prompt: clean up nested if-then

2013-02-18 Thread martinerikwerner
From: Martin Erik Werner Minor clean up of if-then nesting in checks for environment variables and config options. No functional changes. Signed-off-by: Martin Erik Werner --- contrib/completion/git-prompt.sh | 27 +-- 1 file changed, 13 insertions(+), 14 deletions(-)

Re: [PATCH] shell-prompt: clean up nested if-then

2013-02-18 Thread Martin Erik Werner
On Mon, 2013-02-18 at 21:31 +0100, Simon vanaf Telefoon wrote: > Hi all, sorry for top posting :-( blame the phone and k9 > > I have a small issue with the use of test instead of [ > If that only applies to this section of the entire file. > Coding style has some value. > > Combining nested ifs

Re: [PATCH 4/8] contrib/subtree: Code cleaning and refactoring

2013-02-18 Thread Junio C Hamano
"David A. Greene" writes: > From: Techlive Zheng > > Mostly prepare for the later tests refactoring. > > Signed-off-by: Techlive Zheng > Signed-off-by: David A. Greene > --- Applying: contrib/subtree: Code cleaning and refactoring /srv/project/git/git.git/.git/rebase-apply/patch:219: space be

Re: [PATCH 3/8] contrib/subtree: Ignore testing directory

2013-02-18 Thread Junio C Hamano
"David A. Greene" writes: > From: Techlive Zheng > > Signed-off-by: Techlive Zheng > Signed-off-by: David A. Greene > --- > contrib/subtree/.gitignore |5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/contrib/subtree/.gitignore b/contrib/subtree/.gitignore > ind

Re: [PATCH 1/8] contrib/subtree: Use %B for split subject/body

2013-02-18 Thread Junio C Hamano
"David A. Greene" writes: > From: Techlive Zheng > > Use %B to format the commit message and body to avoid an extra newline > if a commit only has a subject line. > > Signed-off-by: Techlive Zheng > Signed-off-by: David A. Greene > --- > contrib/subtree/t/t7900-subtree.sh | 11 +++ >

Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Junio C Hamano
Jeff King writes: > This is not related to GSoC anymore, but I think handling multiple > versions is already pretty easy. You can just install to > "$HOME/local/git/$TAGNAME" or similar, and then symlink the "bin/git" > binary from there into your PATH as git.$TAGNAME (e.g., git.v1.7.8). Git > al

Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Junio C Hamano
Ramkumar Ramachandra writes: > [corrected David Barr's email address] > > Jeff King wrote: >> And I do not want to blame the students here (some of whom are on the cc >> list :) ). They are certainly under no obligation to stick around after >> GSoC ends, and I know they have many demands on thei

Re: Git bundles for backup and cloning: the Zaphod Beeblebrox thread

2013-02-18 Thread Philip Oakley
From: "Alain Kalker" Sent: Sunday, February 17, 2013 7:28 PM From the current documentation for git-bundle(1), it may not be clear for users unfamilliar with Git, how to create a bundle which can be used for backup purposes, or, more generally, to clone to a completely new repository. Philip Oa

Re: git clone tag shallow

2013-02-18 Thread Junio C Hamano
Thibault Kruse writes: >> I am not sure why you meant to treat (2) and (3) differently, >> though. Care to elaborate? > > As in my example, git clone --branch does not accept all of (3). That is a prime example of outside "checkout" we give a white lie to show the most common to help beginner

Re: [PATCHv2 04/10] pkt-line: change error message for oversized packet

2013-02-18 Thread Jeff King
On Mon, Feb 18, 2013 at 01:25:35PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > But it's easy to do (1), and it starts the clock ticking for > > the 1000-byte readers to become obsolete. > > Yup, I agree with that goal. Having just looked at the pkt-line callers a lot, I think most o

Re: Git Merge 2013 Conference, Berlin

2013-02-18 Thread Scott Chacon
Right now we have: Dev day: 50 User day: 295 Hack day: 200 I'm not sure what the actual turnout will be, but it looks like it's going to be pretty massive. I wanted to go through the Dev day signups and figure out if everyone really belongs there (is an actual contributor to a core git project)

Re: [PATCH v2 02/15] user-manual: Update for receive.denyCurrentBranch=refuse

2013-02-18 Thread Junio C Hamano
Drew Northup writes: > This looks safe to me, with the minor nit that "ofthe" ("of the") > isn't one word. Thanks; typo corrected. -- 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.or

Re: [PATCHv2 04/10] pkt-line: change error message for oversized packet

2013-02-18 Thread Junio C Hamano
Jeff King writes: > But it's easy to do (1), and it starts the clock ticking for > the 1000-byte readers to become obsolete. Yup, I agree with that goal. -- 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

Re: Git Merge 2013 Conference, Berlin

2013-02-18 Thread Jeff King
On Mon, Feb 18, 2013 at 09:52:34PM +0100, Thomas Rast wrote: > Scott Chacon writes: > > > We're starting off in Berlin, May 9-11th. GitHub has secured > > conference space at the Radisson Blu Berlin for those days. I have a > > smaller room for the first day so we can get 30-40 Git implementor

Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Jeff King
On Tue, Feb 19, 2013 at 01:15:49AM +0530, Ramkumar Ramachandra wrote: > Take what I'm about to say with a pinch of salt, because I've never mentored. > > Mentors often don't provide much technical assistance: students should > just post to the list with queries, or ask on #git-devel. Mentors > s

Potential GSoC13 projects (Re: Google Summer of Code 2013 (GSoC13))

2013-02-18 Thread Jonathan Nieder
Ramkumar Ramachandra wrote: > Jonathan Nieder wrote: >> - cross-compilable git > > Why, exactly? Git for embedded devices? My personal motivation would be building Git for Windows while spending as little time on Windows as possible. People deploying git to 32-bit x86, 64-bit x86, and ARM (thi

Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Jeff King
On Tue, Feb 19, 2013 at 02:14:54AM +0530, Ramkumar Ramachandra wrote: > > - assimilating the distro builds: "make deb-pkg", "make rpm-pkg", > >etc along the same lines as the linux kernel's script/package/, > >to help people get recent git installed when they want it > > Overkill. I jus

[PATCH 8/8] Remove test artifaces from clean rule

2013-02-18 Thread David A. Greene
From: "David A. Greene" There should be no need to remove 'mainline' nd 'subproj' in the Makefile as these should always be created under the test directory. Signed-off-by: David A. Greene --- contrib/subtree/Makefile |1 - 1 file changed, 1 deletion(-) diff --git a/contrib/subtree/Makefi

[PATCH 7/8] contrib/subtree: Remove --annotate

2013-02-18 Thread David A. Greene
From: "David A. Greene" Remove --annotate. This obviates the need for an --unannotate command. We really want a more generalized commit message rewrite mechanism. Signed-off-by: David A. Greene --- contrib/subtree/git-subtree.sh |6 + contrib/subtree/t/t7900-subtree.sh | 50 +++

[PATCH 5/8] contrib/subtree: Make each test self-contained

2013-02-18 Thread David A. Greene
From: Techlive Zheng Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene --- contrib/subtree/t/t7900-subtree.sh | 1000 +--- 1 file changed, 693 insertions(+), 307 deletions(-) diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-

[PATCH 6/8] contrib/subtree: Handle '--prefix' argument with a slash appended

2013-02-18 Thread David A. Greene
From: Techlive Zheng 'git subtree merge' will fail if the argument of '--prefix' has a slash appended. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene --- contrib/subtree/git-subtree.sh |2 +- contrib/subtree/t/t7900-subtree.sh | 20 2 files changed

[PATCH 4/8] contrib/subtree: Code cleaning and refactoring

2013-02-18 Thread David A. Greene
From: Techlive Zheng Mostly prepare for the later tests refactoring. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene --- contrib/subtree/t/t7900-subtree.sh | 256 +++- 1 file changed, 136 insertions(+), 120 deletions(-) diff --git a/contrib/subtr

[PATCH 3/8] contrib/subtree: Ignore testing directory

2013-02-18 Thread David A. Greene
From: Techlive Zheng Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene --- contrib/subtree/.gitignore |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/subtree/.gitignore b/contrib/subtree/.gitignore index 91360a3..59aeeb4 100644 --- a/contrib/subtr

[PATCH 2/8] contrib/subtree: Fix whitespaces

2013-02-18 Thread David A. Greene
From: Techlive Zheng Previous code does not fulfill Git's whitespace policy. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene --- contrib/subtree/git-subtree.sh | 68 contrib/subtree/git-subtree.txt| 42 ++--- contrib/subtree/t/t7900-subtree.sh | 326

[PATCH 1/8] contrib/subtree: Use %B for split subject/body

2013-02-18 Thread David A. Greene
From: Techlive Zheng Use %B to format the commit message and body to avoid an extra newline if a commit only has a subject line. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene --- contrib/subtree/t/t7900-subtree.sh | 11 +++ 1 file changed, 11 insertions(+) diff --git

Subtree Fixes Updates

2013-02-18 Thread David A. Greene
Here are the subtree fixes I've got with changes in response to feedback. -- 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

Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Jeff King
On Mon, Feb 18, 2013 at 11:34:24AM -0800, Jonathan Nieder wrote: > Some potential projects (unfiltered --- please take them with a grain > of salt): > [...] > - collaborative notes editing: fix the default notes refspec, >make sure the "notes pull" workflow works well and is documented >w

Re: Git Merge 2013 Conference, Berlin

2013-02-18 Thread Thomas Rast
Scott Chacon writes: > We're starting off in Berlin, May 9-11th. GitHub has secured > conference space at the Radisson Blu Berlin for those days. I have a > smaller room for the first day so we can get 30-40 Git implementors > together to talk about the future of Git and whatnot. [...] > http:/

Re: [PATCH 1/4] contrib/subtree: Store subtree sources in .gitsubtree and use for push/pull

2013-02-18 Thread Paul Campbell
On Mon, Feb 18, 2013 at 8:20 PM, wrote: > Paul Campbell writes: > >> Subsequent git subtree push/pull operations now default to the values >> stored in .gitsubtree, unless overridden from the command line. >> >> The .gitsubtree file should be tracked as part of the repo as it >> describes where

Re: feature request

2013-02-18 Thread Jeff King
On Mon, Feb 18, 2013 at 02:54:30PM -0500, James Nylen wrote: > > Just would like to request a security feature to help secure peoples github > > accounts more by supporting 2 factor authentication like the yubikey more > > information can be found from this link www.yubico.com/develop/ and googles

Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Ramkumar Ramachandra
Jonathan Nieder wrote: > Hi, > > 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 >> do a fine of administe

Re: What's cooking in git.git (Feb 2013, #05; Tue, 12)

2013-02-18 Thread greened
Junio C Hamano writes: > * dg/subtree-fixes (2013-02-05) 6 commits > (merged to 'next' on 2013-02-09 at 8f19ebe) > + contrib/subtree: make the manual directory if needed > + contrib/subtree: honor DESTDIR > + contrib/subtree: fix synopsis > + contrib/subtree: better error handling for 'subt

Re: [PATCH 1/4] contrib/subtree: Store subtree sources in .gitsubtree and use for push/pull

2013-02-18 Thread greened
Paul Campbell writes: > Subsequent git subtree push/pull operations now default to the values > stored in .gitsubtree, unless overridden from the command line. > > The .gitsubtree file should be tracked as part of the repo as it > describes where parts of the tree came from and can be used to upd

Re: [PATCH] l10n: de.po: translate 35 new messages

2013-02-18 Thread Thomas Rast
Ralf Thielow writes: > #: builtin/branch.c:888 > msgid "too many branches for a rename operation" > -msgstr "" > +msgstr "zu viele Zweige angegeben" You lost the "rename" bit, was that on purpose? Other than that, ACK. -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this l

Re: Rebased git-subtree changes

2013-02-18 Thread greened
Junio C Hamano writes: > This looks to be of mixed quality. The earlier ones look fairly > finished, while the later ones not so much. > > I am tempted to take up to 06/13 and advance them to 'next', without > the rest. Can you let me know what you've taken up? I have a new set with some fixes

Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Thomas Rast
Ramkumar Ramachandra writes: [...] >>> On a related note, I don't like our Wiki. It's down half the time, >>> and it's very badly maintained. I want to write content for our Wiki >>> from the comfort of my editor, with version control aiding me. And I >>> can't stand archaic WikiText. >> >> Ag

Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Jens Lehmann
Am 18.02.2013 20:34, schrieb Jonathan Nieder: > That said, I won't have time to mentor a project on my own. It takes > a lot of time (or luck, to get the student that doesn't need > mentoring). That's my experience too. Also I think it really makes sense to have a co-mentor so you can balance the

Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Jens Lehmann
Am 18.02.2013 20:45, schrieb Thomas Rast: > Ramkumar Ramachandra writes: >> What's the harm of including something estimated to take 80% of a >> summer? > > Maybe even less than 80%. I didn't regret at all having split the summer's topic I mentored into smaller pieces. That made it easy to post

Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Jonathan Nieder
Ramkumar Ramachandra wrote: > Take what I'm about to say with a pinch of salt, because I've never mentored. > > Mentors often don't provide much technical assistance: students should > just post to the list with queries, or ask on #git-devel. Mentors > serve a different purpose; their primary resp

Re: feature request

2013-02-18 Thread James Nylen
On Mon, Feb 18, 2013 at 1:52 PM, Jay Townsend wrote: > Hi everyone, > > Just would like to request a security feature to help secure peoples github > accounts more by supporting 2 factor authentication like the yubikey more > information can be found from this link www.yubico.com/develop/ and goog

Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Thomas Rast
Ramkumar Ramachandra writes: >> * Cannot look at the diff in word-diff mode (and apply it normally). [...] > Also: Having to figure out, heuristically, when to actually turn it on > might be a worthwhile feature, especially for services like GitHub. Actually that's a pretty cute idea of its

Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Thomas Rast
Ronan Keryell writes: >> On Mon, 18 Feb 2013 18:46:05 +0100, Thomas Rast >> said: > > Thomas>The actual programming must be done in C using pthreads > Thomas> for obvious reasons. > > Are there obvious reasons OpenMP would not be enough to do the job? > > It looks like a tra

Re: [PATCH 13/13] contrib/subtree: Remove --annotate

2013-02-18 Thread James Nylen
On Mon, Feb 18, 2013 at 1:39 PM, wrote: > James Nylen writes: >> - add "fancylib" as a subtree of "myprog" >> - commit to "myprog" repo: "fancylib: don't crash as much" >> - split these commits back out to "fancylib" main repo, and remove >> the "fancylib: " prefix > Should this really be a

Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Ramkumar Ramachandra
Jeff King wrote: > On Tue, Feb 19, 2013 at 12:14:19AM +0530, Ramkumar Ramachandra wrote: > >> I'll be frank here. I think the main reason for a student to stick >> around is to see more of his code hit `master`. I think it is >> absolutely essential to get students constantly post iteration after

Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Thomas Rast
Ramkumar Ramachandra writes: > [corrected David Barr's email address] > > Jeff King wrote: >> And I do not want to blame the students here (some of whom are on the cc >> list :) ). They are certainly under no obligation to stick around after >> GSoC ends, and I know they have many demands on thei

Re: Recursive submodule confusing output (bug?)

2013-02-18 Thread Jens Lehmann
Am 18.02.2013 16:58, schrieb Will Entriken: > I am running: > > git submodule update --recursive > > And get the output: > > Submodule path 'Submodules/evernote-ios-sdk': checked out > '391ca643c5b1cd02e9fa869a6b0760436ea452ed' > Submodule path 'Submodules/facebook-ios-sdk': checked

Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Jonathan Nieder
Hi, 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 > do a fine of administering the program. But I have noti

Re: [ANNOUNCE] Git v1.8.2-rc0

2013-02-18 Thread Tim Chase
On 2013-02-17 16:52, Junio C Hamano wrote: > * Color specifiers, e.g. "%C(blue)Hello%C(reset)", used in the >"--format=" option of "git log" and friends can be disabled when >the output is not sent to a terminal by prefixing them with >"auto,", e.g. "%C(auto,blue)Hello%C(auto,reset)".

Re: [PATCH v5] submodule: add 'deinit' command

2013-02-18 Thread Jens Lehmann
Am 17.02.2013 23:32, schrieb Junio C Hamano: > Jens Lehmann writes: >> diff --git a/git-submodule.sh b/git-submodule.sh >> index 004c034..0fb6ee0 100755 >> --- a/git-submodule.sh >> +++ b/git-submodule.sh >> @@ -547,6 +548,82 @@ cmd_init() >> } >> >> # >> +# Unregister submodules from .git/confi

Re: [PATCH] shell-prompt: clean up nested if-then

2013-02-18 Thread Jonathan Nieder
Hi Martin, Martin Erik Werner wrote: > Minor clean up of if-then nesting in checks for environment variables > and config options. No functional changes. Yeah, the nesting was getting a little deep. Thanks for the cleanup. May we have your sign-off? Once this is signed off, Reviewed-by: Jonath

feature request

2013-02-18 Thread Jay Townsend
Hi everyone, Just would like to request a security feature to help secure peoples github accounts more by supporting 2 factor authentication like the yubikey more information can be found from this link www.yubico.com/develop/ and googles 2 factor authentication. Hope it gets implemented as

Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Jeff King
On Tue, Feb 19, 2013 at 12:14:19AM +0530, Ramkumar Ramachandra wrote: > I'll be frank here. I think the main reason for a student to stick > around is to see more of his code hit `master`. I think it is > absolutely essential to get students constantly post iteration after > iteration on the lis

Re: [PATCH 13/13] contrib/subtree: Remove --annotate

2013-02-18 Thread greened
James Nylen writes: > I don't agree that removing `--annotate` obviates the need for `--unannotate`. > > I responded on 1/17 with what I think is a typical and normal use case > for that option: Sorry, I must have missed that reply. > - add "fancylib" as a subtree of "myprog" > - commit to "m

Re: [ANNOUNCE] Git v1.8.2-rc0

2013-02-18 Thread Matthieu Moy
Junio C Hamano writes: > Git v1.8.2 Release Notes (draft) > > > Backward compatibility notes > > > In the upcoming major release (tentatively called 1.8.2), we will > change the behavior of the "git push" command. > > When "git push [$there]"

Re: [PATCH 11/13] contrib/subtree: Make each test self-contained

2013-02-18 Thread greened
Junio C Hamano writes: > I also think it would be a good idea for you to learn to push back > to the original authors; fixing problems in patches by others, while > is a good way to learn how their thinking process went, is not > necessarily fun. Sure, but in this case I said I'd handle it so I

[PATCH] l10n: de.po: translate 35 new messages

2013-02-18 Thread Ralf Thielow
Translate 35 new messages came from git.pot update in 9caaf23 (l10n: Update git.pot (35 new, 14 removed messages)). Signed-off-by: Ralf Thielow --- po/de.po | 140 +++ 1 file changed, 68 insertions(+), 72 deletions(-) diff --git a/po/d

Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Ronan Keryell
> On Mon, 18 Feb 2013 18:46:05 +0100, Thomas Rast > said: Thomas>The actual programming must be done in C using pthreads Thomas> for obvious reasons. Are there obvious reasons OpenMP would not be enough to do the job? It looks like a trade-off between the code readability &

Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Ramkumar Ramachandra
Thomas Rast wrote: > 2. Improving the `git add -p` interface > > * The terminal/line-based interface becomes a problem if diff hunks > are too long to fit in your terminal. I don't know if it's worth coming up with another interface. The best sol

Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Thomas Rast
Thomas Rast writes: > * We should prepare an "ideas page"[...] > https://github.com/trast/git/wiki/SoC-2013-Ideas >From where I'm currently sitting, I won't have the time to mentor this year. So my two earlier proposals are essentially up for grabs: 1. Improving parallelism in various comm

Re: Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Jeff King
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 again, if people feel strongly about Git being a part of it. However, I have gotten a little soured on the GS

Google Summer of Code 2013 (GSoC13)

2013-02-18 Thread Thomas Rast
Hi, Google announced the 2013 incarnation of the Google Summer of Code program on Feb 11: http://www.google-melange.com/gsoc/homepage/google/gsoc2013 Git has taken part in previous years, so I figure somebody should get the ball rolling again! The following items need to be sorted out: * We

Re: [PATCH] read_directory: avoid invoking exclude machinery on tracked files

2013-02-18 Thread Karsten Blees
Am 15.02.2013 20:32, schrieb Junio C Hamano: > Duy Nguyen writes: > >> On Fri, Feb 15, 2013 at 11:52 PM, Junio C Hamano wrote: >>> In the current code, we always check if a path is excluded, and when >>> dealing with DT_REG/DT_LNK, we call treat_file(): >>> >>> * When such a path is excluded, t

[PATCH] shell-prompt: clean up nested if-then

2013-02-18 Thread Martin Erik Werner
Minor clean up of if-then nesting in checks for environment variables and config options. No functional changes. --- contrib/completion/git-prompt.sh | 27 +-- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/contrib/completion/git-prompt.sh b/contrib/compl

Re: Recursive submodule confusing output (bug?)

2013-02-18 Thread Will Entriken
Hello, I am running: git submodule update --recursive And get the output: Submodule path 'Submodules/evernote-ios-sdk': checked out '391ca643c5b1cd02e9fa869a6b0760436ea452ed' Submodule path 'Submodules/facebook-ios-sdk': checked out 'ada467f754febd4f2871d15943e9be16b323f114' Sub

Re: [PATCH v2 02/15] user-manual: Update for receive.denyCurrentBranch=refuse

2013-02-18 Thread Drew Northup
On Thu, Feb 14, 2013 at 1:57 PM, Junio C Hamano wrote: > I did not think the detailed discussion belongs there in the first > place, so I re-read the context. I think the only thing the reader > of the user manual needs to learn at that point of the flow is that > they can push to a non-bare but

Re: [PATCH v3 0/9] User manual updates

2013-02-18 Thread W. Trevor King
On Mon, Feb 18, 2013 at 12:56:07AM -0800, Junio C Hamano wrote: > I've taken the following to 'maint'… Should I rebase v4 onto maint so I don't accidentally collide with any of the previous patches which have already been merged there? It doesn't look like you've pushed the last round of maint ad

Re: [PATCH v3 9/9] user-manual: Use -o latest.tar.gz to create a gzipped tarball

2013-02-18 Thread W. Trevor King
On Sun, Feb 17, 2013 at 06:58:58PM -0800, Junio C Hamano wrote: > It is easy for me to deal with conflicts in this particular case, > but in general it would have been more straightforward to manage if > these more localized phrasing fixes came earlier and a larger > file-wide cosmetic change was d

Re: [PATCH v3 6/9] user-manual: Use 'git config --global user.*' for setup

2013-02-18 Thread W. Trevor King
On Sun, Feb 17, 2013 at 06:47:09PM -0800, Junio C Hamano wrote: > > +Which will adds the following to a file named `.gitconfig` in your > > s/adds/add/; Oops again :p. This change is SOB me. -- This email may be signed or encrypted with GnuPG (http://www.gnupg.org). For more information, see h

Re: [PATCHv2 05/10] pkt-line: rename s/packet_read_line/packet_read/

2013-02-18 Thread Jonathan Nieder
Jeff King wrote: > On Mon, Feb 18, 2013 at 02:19:15AM -0800, Jonathan Nieder wrote: >> In combination with patch 3, this changes the meaning of packet_read() >> without changing its signature, which could make other patches >> cherry-picked on top change behavior in unpredictable ways. :( >> >> So

Re: [PATCHv2 06/10] pkt-line: share buffer/descriptor reading implementation

2013-02-18 Thread Jonathan Nieder
Jeff King wrote: > But is it noisy about a missing pipe? We do not get EPIPE for reading. Ah, that makes more sense. [...] >>> + len = packet_read_from_buf(line, sizeof(line), &last->buf, >>> &last->len); >>> + if (len && line[len - 1] == '\n') >>> + len--;

Re: [PATCHv2 10/10] remote-curl: always parse incoming refs

2013-02-18 Thread Jonathan Nieder
Jeff King wrote: > remote-curl.c | 23 +-- > 1 file changed, 13 insertions(+), 10 deletions(-) I like. -- 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/majord

Re: [PATCHv2 06/10] pkt-line: share buffer/descriptor reading implementation

2013-02-18 Thread Jeff King
On Mon, Feb 18, 2013 at 02:43:50AM -0800, Jonathan Nieder wrote: > Jeff King wrote: > > > The packet_read function reads from a descriptor. > > Ah, so this introduces a new analagous helper that reads from > a strbuf, to avoid the copy-from-async-procedure hack? Not from a strbuf, but basically

Re: [PATCHv2 08/10] remote-curl: pass buffer straight to get_remote_heads

2013-02-18 Thread Jonathan Nieder
Jeff King wrote: > I don't know that this code was hurting anything, but it has always > struck me as ugly and a possible source of error. And now it's gone. Heh. Belongs in the commit message, presumably. I don't think the async procedure was very harmful, but it's nice to avoid the cost of a

Re: [PATCHv2 06/10] pkt-line: share buffer/descriptor reading implementation

2013-02-18 Thread Jonathan Nieder
Jeff King wrote: > The packet_read function reads from a descriptor. Ah, so this introduces a new analagous helper that reads from a strbuf, to avoid the copy-from-async-procedure hack? [...] > --- a/pkt-line.c > +++ b/pkt-line.c > @@ -103,12 +103,26 @@ static int safe_read(int fd, void *buffer,

  1   2   >