Re: Fix git-svn for SVN 1.7

2012-07-30 Thread Junio C Hamano
Eric Wong writes: > Perhaps we can depend on the URI.pm module? It seems to be > widely-available and not be a significant barrier to installation. On > the other hand, I don't know its history, either (especially since we're > now dealing with SVN changes...). > > Anyways, I don't like relying

Re: a error in git documentation

2012-07-30 Thread Matthieu Moy
Jialin Liu writes: > In http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository > > Notice how you don’t have to run git add on the benchmarks.rb file in this > case before you commit. In which case? (the page is rather long) I didn't see a case where "git add" was not needed

Re: Fix git-svn for SVN 1.7

2012-07-30 Thread Michael G Schwern
On 2012.7.30 7:18 PM, Eric Wong wrote: > Michael G Schwern wrote: >> On 2012.7.30 3:15 PM, Eric Wong wrote: Right now, canonicalization is a bug generator. Paths and URLs have to be in the same form when they're compared. This requires meticulous care on the part of the code

Re: GIT smart http vs GIT over ssh

2012-07-30 Thread vishwajeet singh
On Tue, Jul 31, 2012 at 8:40 AM, Konstantin Khomoutov wrote: > On Tue, Jul 31, 2012 at 08:36:07AM +0530, vishwajeet singh wrote: > >> Just wanted to know the difference between smart http and ssh and in >> what scenarios we need them >> I am setting up a git server, can I just do with smart http

Re: GIT smart http vs GIT over ssh

2012-07-30 Thread Konstantin Khomoutov
On Tue, Jul 31, 2012 at 08:36:07AM +0530, vishwajeet singh wrote: > Just wanted to know the difference between smart http and ssh and in > what scenarios we need them > I am setting up a git server, can I just do with smart http support > or I need to enable the ssh support to use git effectively

a error in git documentation

2012-07-30 Thread Jialin Liu
In http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository Notice how you don’t have to run git add on the benchmarks.rb file in this case before you commit. I think how should be changed to now-- To unsubscribe from this list: send the line "unsubscribe git" in the body of a m

Re: Fix git-svn for SVN 1.7

2012-07-30 Thread Eric Wong
Michael G Schwern wrote: > On 2012.7.30 3:15 PM, Eric Wong wrote: > >> Right now, canonicalization is a bug generator. Paths and URLs have to be > >> in > >> the same form when they're compared. This requires meticulous care on the > >> part of the coder and reviewer to check every comparison.

Re: Fix git-svn for SVN 1.7

2012-07-30 Thread Michael G Schwern
On 2012.7.30 3:15 PM, Eric Wong wrote: >> Right now, canonicalization is a bug generator. Paths and URLs have to be in >> the same form when they're compared. This requires meticulous care on the >> part of the coder and reviewer to check every comparison. It scatters the >> logic for proper com

Re: Fix git-svn for SVN 1.7

2012-07-30 Thread Eric Wong
Michael G Schwern wrote: > On 2012.7.30 1:38 PM, Eric Wong wrote: > > Anyways, I don't like relying on operator overloading, it makes code > > harder to read and review. > > Right now, canonicalization is a bug generator. Paths and URLs have to be in > the same form when they're compared. This

What's cooking in git.git (Jul 2012, #10; Mon, 30)

2012-07-30 Thread Junio C Hamano
What's cooking in git.git (Jul 2012, #10; Mon, 30) -- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The tip of 'master' as of this writing is

[ANNOUNCE] Git v1.7.12-rc1

2012-07-30 Thread Junio C Hamano
A release candidate Git v1.7.12-rc1 is now available for testing at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 34f04ef64fd60bec32388afe27cc4e447ca55229 git-1.7.12.rc1.tar.gz 88a97012fd1454190e8eb49114

[ANNOUNCE] Git v1.7.11.4

2012-07-30 Thread Junio C Hamano
The latest maintenance release Git v1.7.11.4 is now available at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 36180126eb2048d49b00f6092d83568df4e61c4c git-1.7.11.4.tar.gz ceb4b4699a6561719aa07e01601ed54

Re: PROPFIND 405 with git-http-backend and Smart HTTP

2012-07-30 Thread Bo98
Shawn Pearce wrote > > Maybe you forgot to enable ExecCGI? > Whoops, completely forgot about that, but, assuming I did it right, it still doesn't seem to work. Here's what I did: Options +ExecCGI Allow From All -- View this message in context: http://git.661346.n2.nabble.com

Re: New git.pot is generated for the upcoming git v1.7.12

2012-07-30 Thread Junio C Hamano
Jiang Xin writes: > L10n teams: > > New "git.pot" is generated from git v1.7.12-rc0. L10n teams can get it > from the usual place and start translation. > > * https://github.com/git-l10n/git-po/commits/master > > This update is quite small: > > l10n: Update git.pot (4 new, 3 removed messages

Re: Fix git-svn for SVN 1.7

2012-07-30 Thread Michael G Schwern
On 2012.7.30 1:38 PM, Eric Wong wrote: >> A better solution would be to have path and URL objects which overload >> the eq operator and automatically stringify canonicalized and escaped. > > Perhaps we can depend on the URI.pm module? It seems to be > widely-available and not be a significant bar

Re: [PATCH] send-email: improve RFC2047 quote parsing

2012-07-30 Thread Junio C Hamano
Thomas Rast writes: > The RFC2047 unquoting, used to parse email addresses in From and Cc > headers, is broken in several ways: > > * It erroneously substitutes ' ' for '_' in *the whole* header, even > outside the quoted field. [Noticed by Christoph.] > > * It is too liberal in its matching, a

Re: [PATCH 3/7] Extract, test and enhance the logic to collapse ../foo paths.

2012-07-30 Thread Michael G Schwern
On 2012.7.30 12:51 PM, Eric Wong wrote: >> The SVN API functions will not accept ../foo but their canonicalization >> functions will not collapse it. So we'll have to do it ourselves. >> >> _collapse_dotdot() works better than the existing regex did. > > I don't dispute it's better, but it's wort

Re: PROPFIND 405 with git-http-backend and Smart HTTP

2012-07-30 Thread Shawn Pearce
On Mon, Jul 30, 2012 at 1:30 PM, Bo98 wrote: > > Shawn Pearce wrote >> >> No, a smart HTTP response looks more like this: >> >> 1e# service=git-receive-pack >> 00a5e7a3bcbbb8083e812ce07a5459f0e6d30edfb9fe HEAD include-tag >> multi_ack_detailed multi_ack ofs-delta side-band side-band-64k >> thi

Re: Fix git-svn for SVN 1.7

2012-07-30 Thread Eric Wong
"Michael G. Schwern" wrote: > There is one exception. t9100-git-svn-basic.sh fails 11-13. This appears > to be due to a bug in SVN to do with symlinks. Leave that for somebody > else, this is the final submission in the series. That's fine, a few failing tests is better than completely failing

Re: PROPFIND 405 with git-http-backend and Smart HTTP

2012-07-30 Thread Bo98
Shawn Pearce wrote > > No, a smart HTTP response looks more like this: > > 1e# service=git-receive-pack > 00a5e7a3bcbbb8083e812ce07a5459f0e6d30edfb9fe HEAD include-tag > multi_ack_detailed multi_ack ofs-delta side-band side-band-64k > thin-pack no-progress shallow no-done > > Looks like Apa

[GSoC] Designing a faster index format - Progress report week 15

2012-07-30 Thread Thomas Gummerer
== Work done in the previous 14 weeks == - Definition of a tentative index file v5 format [1]. This differs from the proposal in making it possible to bisect the directory entries and file entries, to do a binary search. The exact bits for each section were also defined. To further compress

Re: [RFC v2 11/16] Add explanatory comment for transport-helpers refs mapping.

2012-07-30 Thread Florian Achleitner
On Monday 30 July 2012 14:15:53 Jonathan Nieder wrote: > Junio C Hamano wrote: > > Jonathan Nieder writes: > >>> + /* > >>> + * If the remote helper advertised the "refspec" capability, > >>> + * it will have the written result of the import to the refs > > > > perhaps s/will have the written r

Re: [PATCH 6/7] Switch path canonicalization to use the SVN API.

2012-07-30 Thread Eric Wong
Michael G Schwern wrote: > On 2012.7.28 6:55 AM, Jonathan Nieder wrote: > > Michael G. Schwern wrote: > >> --- a/perl/Git/SVN/Utils.pm > >> +++ b/perl/Git/SVN/Utils.pm > >> @@ -86,6 +86,27 @@ sub _collapse_dotdot { > >> > >> > >> sub canonicalize_path { > >> + my $path = shift; > >> + > >> +

Re: [PATCH 3/7] Extract, test and enhance the logic to collapse ../foo paths.

2012-07-30 Thread Eric Wong
"Michael G. Schwern" wrote: > From: "Michael G. Schwern" > > The SVN API functions will not accept ../foo but their canonicalization > functions will not collapse it. So we'll have to do it ourselves. > > _collapse_dotdot() works better than the existing regex did. I don't dispute it's better

[PATCH] send-email: improve RFC2047 quote parsing

2012-07-30 Thread Thomas Rast
The RFC2047 unquoting, used to parse email addresses in From and Cc headers, is broken in several ways: * It erroneously substitutes ' ' for '_' in *the whole* header, even outside the quoted field. [Noticed by Christoph.] * It is too liberal in its matching, and happily matches the start of

Re: [RFC v2 11/16] Add explanatory comment for transport-helpers refs mapping.

2012-07-30 Thread Jonathan Nieder
Junio C Hamano wrote: > Jonathan Nieder writes: >>> + /* >>> +* If the remote helper advertised the "refspec" capability, >>> +* it will have the written result of the import to the refs > > perhaps s/will have the written result of/would have written result of/? That would sound like

Re: A new way to get a sha1?

2012-07-30 Thread Martin Langhoff
On Mon, Jul 30, 2012 at 2:29 PM, Junio C Hamano wrote: > The idea was that you do not have to give abbreviated SHA-1 to Git > in the first place. Ah, sorry, I didn't get _that_ point. I thought you were trying to demo a way to get a sha1. > What doesn't work? My copy of v1.7.10.1 seems to grok

Re: A new way to get a sha1?

2012-07-30 Thread Andreas Schwab
Martin Langhoff writes: > But any ref definition can be turned into a sha1 with this snippet: > > git show --pretty=format:%H HEAD git rev-parse HEAD > If you want to get the last 10 sha1s, use the same "pretty" with git log > >git log --pretty=format:%H HEAD | head git rev-

Re: A new way to get a sha1?

2012-07-30 Thread Junio C Hamano
Martin Langhoff writes: > On Mon, Jul 30, 2012 at 11:45 AM, Junio C Hamano wrote: >> git show -s ':/^t1100-.*: Fix an interm' > > That doesn't work for me (git 1.7.10.4 as per Fedora 18 rpms) in > git.git. But the idea is sound -- git can give you the sha1 trivially. > You don't need add

Re: [PATCH] Improve tests for detached worktree in git-submodule

2012-07-30 Thread Daniel Graña
On Mon, Jul 30, 2012 at 3:09 PM, Junio C Hamano wrote: > Daniel Graña writes: > >> * Check submodule is correctly initialized and updated after cloning >> .dotfiles >> >> Signed-off-by: Daniel Graña >> --- > > Thanks. > >> @@ -23,14 +27,27 @@ test_expect_success 'submodule on detached working t

Re: A new way to get a sha1?

2012-07-30 Thread Martin Langhoff
On Mon, Jul 30, 2012 at 11:45 AM, Junio C Hamano wrote: > git show -s ':/^t1100-.*: Fix an interm' That doesn't work for me (git 1.7.10.4 as per Fedora 18 rpms) in git.git. But the idea is sound -- git can give you the sha1 trivially. You don't need additional glue. But any ref definitio

Re: [PATCH] Improve tests for detached worktree in git-submodule

2012-07-30 Thread Junio C Hamano
Daniel Graña writes: > * Check submodule is correctly initialized and updated after cloning .dotfiles > > Signed-off-by: Daniel Graña > --- Thanks. > @@ -23,14 +27,27 @@ test_expect_success 'submodule on detached working tree' ' > git clone --bare ../remote .dotfiles && >

Re: A new way to get a sha1?

2012-07-30 Thread Andreas Schwab
Thomas Badie writes: > For this case, I don't think I'll use it, but it shows how to use the editor > in a replacement of an interactive tool, and it is interesting. I'd change > vi for emacs but this is religious. If you use emacs anyway you could run the shell inside it, giving you all the pow

Re: Cannot delete weirdly named branch

2012-07-30 Thread Junio C Hamano
Michael Haggerty writes: > On 07/23/2012 08:42 PM, Junio C Hamano wrote: >> "abhisek...@gmail.com" writes: >> >>> Now I cannot delete this branch. Running: >>> git branch -d --tracking >>> gives an error: unknown option `tracking' >> >> I do not think this is supposed to work, but it does by acc

[PATCH] Improve tests for detached worktree in git-submodule

2012-07-30 Thread Daniel Graña
* Check submodule is correctly initialized and updated after cloning .dotfiles Signed-off-by: Daniel Graña --- t/t7409-submodule-detached-worktree.sh | 31 --- 1 files changed, 24 insertions(+), 7 deletions(-) diff --git a/t/t7409-submodule-detached-worktree.sh b/

Re: [PATCH] Improve tests for detached worktree in git-submodule

2012-07-30 Thread Junio C Hamano
Junio C Hamano writes: > Daniel Graña writes: > ... >> is it still better than "git rev-parse --max-count=1 HEAD" seen in >> t7406-submodule.update.sh? > > "git rev-parse --max-count=1 HEAD" will show "--max-count=1\n" > followed by the value of HEAD, so if the expected result and the > actual r

Re: [PATCH] Improve tests for detached worktree in git-submodule

2012-07-30 Thread Daniel Graña
On Mon, Jul 30, 2012 at 2:43 PM, Daniel Graña wrote: > * Check submodule is correctly initialized and updated after cloning .dotfiles > > Signed-off-by: Daniel Graña > --- Ignore this patch, I am sending another without extra space after standard output redirection. > > Remove $TRASH_DIRECTOR

Re: [PATCH] Improve tests for detached worktree in git-submodule

2012-07-30 Thread Junio C Hamano
Daniel Graña writes: > On Mon, Jul 30, 2012 at 2:02 PM, Junio C Hamano wrote: >> Daniel Graña writes: >> >>> Signed-off-by: Daniel Graña >>> --- >>> t/t7409-submodule-detached-worktree.sh | 31 >>> --- >>> 1 files changed, 24 insertions(+), 7 deletions(-) >>> >>

[PATCH] Improve tests for detached worktree in git-submodule

2012-07-30 Thread Daniel Graña
* Check submodule is correctly initialized and updated after cloning .dotfiles Signed-off-by: Daniel Graña --- Remove $TRASH_DIRECTORY and "git rev-parse --verify HEAD" as suggested by Junio t/t7409-submodule-detached-worktree.sh | 31 --- 1 files changed, 24 inse

Re: A new way to get a sha1?

2012-07-30 Thread Thomas Badie
2012/7/30 Jeff King : > On Mon, Jul 30, 2012 at 06:40:12PM +0200, Thomas Badie wrote: > >> I understand your opinion. My solution was a easier way to make your >> proposition about `git log --oneline`, because I don't want to copy these >> 6 numbers by hand. I'd prefer select the right line simply.

Re: [RFC v2 11/16] Add explanatory comment for transport-helpers refs mapping.

2012-07-30 Thread Junio C Hamano
Jonathan Nieder writes: > I would like to see the patch applied so the remote-svn series without > it gets shorter and easier to review. ;-) Munging the two context > lines ending with argv_array_clear(&importer_argv); to > > free(fastimport.argv); > fastimport.argv = NULL; > > makes

[PATCH v2] link_alt_odb_entry: fix read over array bounds reported by valgrind

2012-07-30 Thread Heiko Voigt
pfxlen can be longer than the path in objdir when relative_base contains the path to Git's object directory. Signed-off-by: Heiko Voigt --- On Sun, Jul 29, 2012 at 05:54:02PM -0700, Junio C Hamano wrote: > Heiko Voigt writes: > > > pfxlen can be longer than the path in objdir when relative_bas

Re: Cannot delete weirdly named branch

2012-07-30 Thread Michael Haggerty
On 07/23/2012 08:42 PM, Junio C Hamano wrote: "abhisek...@gmail.com" writes: Now I cannot delete this branch. Running: git branch -d --tracking gives an error: unknown option `tracking' I do not think this is supposed to work, but it does by accident. $ git branch -d -- --tracking

Re: [RFC v2 11/16] Add explanatory comment for transport-helpers refs mapping.

2012-07-30 Thread Junio C Hamano
Jonathan Nieder writes: > Hi Junio, > > Florian Achleitner wrote: > >> transport-helpers can advertise the 'refspec' capability, >> if not a default refspec *:* is assumed. This explains >> the post-processing of refs after fetching with fast-import. >> >> Signed-off-by: Florian Achleitner > > T

Re: [PATCH] Improve tests for detached worktree in git-submodule

2012-07-30 Thread Daniel Graña
On Mon, Jul 30, 2012 at 2:02 PM, Junio C Hamano wrote: > Daniel Graña writes: > >> Signed-off-by: Daniel Graña >> --- >> t/t7409-submodule-detached-worktree.sh | 31 >> --- >> 1 files changed, 24 insertions(+), 7 deletions(-) >> >> diff --git a/t/t7409-submodule-d

Re: A new way to get a sha1?

2012-07-30 Thread Thomas Badie
2012/7/30 Thomas Rast : > Thomas Badie writes: > >> The idea is to have a perl module which run through >> the log history and print 10 shortlog associated with a number >> from 0 to 9, and a message below "Select commit [| 0, 9 |] or >> next row ?" or this kind of message with several options. >>

Re: [RFC v2 11/16] Add explanatory comment for transport-helpers refs mapping.

2012-07-30 Thread Jonathan Nieder
Hi Junio, Florian Achleitner wrote: > transport-helpers can advertise the 'refspec' capability, > if not a default refspec *:* is assumed. This explains > the post-processing of refs after fetching with fast-import. > > Signed-off-by: Florian Achleitner The patch below adds a comment to fetch_w

Fwd: [PATCH] Improve tests for detached worktree in git-submodule

2012-07-30 Thread Daniel Graña
Forwardning for the record as vger rejected my previous HTML email. -- Forwarded message -- From: Daniel Graña Date: Mon, Jul 30, 2012 at 2:04 PM Subject: Re: [PATCH] Improve tests for detached worktree in git-submodule To: Jeff King Cc: Junio C Hamano , git@vger.kernel.org Hi

Re: [PATCH] Improve tests for detached worktree in git-submodule

2012-07-30 Thread Junio C Hamano
Daniel Graña writes: > Signed-off-by: Daniel Graña > --- > t/t7409-submodule-detached-worktree.sh | 31 --- > 1 files changed, 24 insertions(+), 7 deletions(-) > > diff --git a/t/t7409-submodule-detached-worktree.sh > b/t/t7409-submodule-detached-worktree.sh > ind

Re: A new way to get a sha1?

2012-07-30 Thread Thomas Badie
2012/7/30 Junio C Hamano : > Jan Engelhardt writes: > >> On Monday 2012-07-30 14:11, Thomas Badie wrote: >> >>>Hi all, >>> >>>When I should fixup or squash a commit, I nearly never >>>remember how to get the sha1 of the commit I want to fixup. >>>Because sometimes HEAD~n is not enough, I make `git

Re: [RFC 1/4 v2] Implement a basic remote helper for svn in C.

2012-07-30 Thread Jonathan Nieder
Florian Achleitner wrote: > Hm .. that would mean, that both fast-import and git (transport-helper) would > write to the remote-helper's stdin, right? Yes, first git writes the list of refs to import, and then fast-import writes feedback during the import. Is that a problem? -- To unsubscribe f

Re: A new way to get a sha1?

2012-07-30 Thread Jeff King
On Mon, Jul 30, 2012 at 06:40:12PM +0200, Thomas Badie wrote: > I understand your opinion. My solution was a easier way to make your > proposition about `git log --oneline`, because I don't want to copy these > 6 numbers by hand. I'd prefer select the right line simply. > > My solution is intende

Re: A new way to get a sha1?

2012-07-30 Thread Thomas Badie
2012/7/30 Sitaram Chamarty : > On Mon, Jul 30, 2012 at 5:41 PM, Thomas Badie wrote: >> Hi all, >> >> When I should fixup or squash a commit, I nearly never >> remember how to get the sha1 of the commit I want to fixup. >> Because sometimes HEAD~n is not enough, I make `git log`, >> copy the sha1 o

Re: A new way to get a sha1?

2012-07-30 Thread Thomas Badie
2012/7/30 Jan Engelhardt : > On Monday 2012-07-30 14:11, Thomas Badie wrote: > >>Hi all, >> >>When I should fixup or squash a commit, I nearly never >>remember how to get the sha1 of the commit I want to fixup. >>Because sometimes HEAD~n is not enough, I make `git log`, >>copy the sha1 of the right

Re: [PATCH] Improve tests for detached worktree in git-submodule

2012-07-30 Thread Jeff King
On Mon, Jul 30, 2012 at 01:10:10PM -0300, Daniel Graña wrote: > Subject: Re: [PATCH] Improve tests for detached worktree in git-submodule > > Signed-off-by: Daniel Graña The space between the subject and your S-o-b is an excellent place to explain the rationale for your commit. How are we impr

Re: PROPFIND 405 with git-http-backend and Smart HTTP

2012-07-30 Thread Shawn Pearce
On Mon, Jul 30, 2012 at 1:40 AM, Bo98 wrote: > > Shawn Pearce wrote >> >>> And here's a snip from my access_log: >>> >>> ::1 - - [29/Jul/2012:18:34:34 +0100] "GET >>> /repo/myproject.git/info/refs?service=git-receive-pack HTTP/1.1" 200 117 >> >> Was this request actually served using the smart

Re: bug (?) in send email

2012-07-30 Thread Jeff King
On Mon, Jul 30, 2012 at 08:38:21AM -0700, Junio C Hamano wrote: > > I think this patch would be a better match for what RFC2047 specifies. > > On the one hand it avoids substituting _ outside of encodings, but OTOH > > it also handles more than one encoded-word. > > Yeah, I think it is an improve

Re: bug (?) in send email

2012-07-30 Thread Jeff King
On Mon, Jul 30, 2012 at 02:30:35PM +0200, Thomas Rast wrote: > > Removing this line > > s/_/ /g; > > here > > https://github.com/git/git/blob/master/git-send-email.perl#L867 > > > > Solves this problem for me. But I really don't have any clue, what > > kind of side effects this modification on "su

Re: [RFC v2 01/16] Implement a remote helper for svn in C.

2012-07-30 Thread Junio C Hamano
Florian Achleitner writes: > Enables basic fetching from subversion repositories. When processing Remote > URLs > starting with svn::, git invokes this remote-helper. > It starts svnrdump to extract revisions from the subversion repository in the > 'dump file format', and converts them to a git-

[PATCH] Improve tests for detached worktree in git-submodule

2012-07-30 Thread Daniel Graña
Signed-off-by: Daniel Graña --- t/t7409-submodule-detached-worktree.sh | 31 --- 1 files changed, 24 insertions(+), 7 deletions(-) diff --git a/t/t7409-submodule-detached-worktree.sh b/t/t7409-submodule-detached-worktree.sh index db75642..d88f400 100755 --- a/t/t7

[PATCH/RFC] l10n: de.po: translate 4 new messages

2012-07-30 Thread Ralf Thielow
Translate 4 new messages came from git.pot update in 0bbe5b4 (l10n: Update git.pot (4 new, 3 removed messages)). Signed-off-by: Ralf Thielow --- Hi German l10n team, please review this small update on German translation. Thanks, Ralf po/de.po | 16 1 file changed, 8 insertion

Re: A new way to get a sha1?

2012-07-30 Thread Thomas Rast
Thomas Badie writes: > The idea is to have a perl module which run through > the log history and print 10 shortlog associated with a number > from 0 to 9, and a message below "Select commit [| 0, 9 |] or > next row ?" or this kind of message with several options. > > So I ask to the community if

Re: [PATCH] buitin_config: return postitive status in get_value

2012-07-30 Thread Junio C Hamano
Nguyen Thai Ngoc Duy writes: > On Mon, Jul 30, 2012 at 3:43 AM, Junio C Hamano wrote: >> +. You use '--global' option without $HOME being properly set (ret=128), >> +. Any other errors (ret=7). > > To be pedantic, ret=128 is a result of die() and not setting $HOME is > just one of them. There's

Re: A new way to get a sha1?

2012-07-30 Thread Junio C Hamano
Jan Engelhardt writes: > On Monday 2012-07-30 14:11, Thomas Badie wrote: > >>Hi all, >> >>When I should fixup or squash a commit, I nearly never >>remember how to get the sha1 of the commit I want to fixup. >>Because sometimes HEAD~n is not enough, I make `git log`, >>copy the sha1 of the right c

Re: [PATCH 0/3] null sha1 in trees

2012-07-30 Thread Jeff King
On Sun, Jul 29, 2012 at 03:15:11PM -0700, Junio C Hamano wrote: > All looked reasonable, even though I'd want to read the > surrounding codepath over for 2/3 a few more times. > > Will queue; thanks. Yeah, 2/3 is the one that gives me the most pause. I originally assumed we would never want to p

Re: bug (?) in send email

2012-07-30 Thread Junio C Hamano
Thomas Rast writes: > It would prevent spaces from being decoded correctly if the encoding > program chooses to make the '_'. git-format-patch does not actually do > this, see the big comment around pretty.c:304. > > I think this patch would be a better match for what RFC2047 specifies. > On the

Re: [PATCHv2 5/5] t3910: use the UTF8_NFD_TO_NFC test prereq

2012-07-30 Thread Junio C Hamano
Michael J Gruber writes: > Besides reusing the new test prerequisite, this fixes also the issue > that the current output is not TAP compliant and produces the output "no > reason given" [for skipping]. > > Signed-off-by: Michael J Gruber > --- > Same patch, new subject line which matches the ac

Re: inconsistent logs when displayed on screen / piped to a file

2012-07-30 Thread Mojca Miklavec
On Mon, Jul 30, 2012 at 3:39 PM, Michael J Gruber wrote: > Mojca Miklavec venit, vidit, dixit 30.07.2012 14:25: >> >> I'm trying to use "git log" to generate ChangeLog for a project >> recently migrated from CVS. >> >> The problem is that >> git log --summary --stat --no-merges --date=short --d

[RFC v2 11/16] Add explanatory comment for transport-helpers refs mapping.

2012-07-30 Thread Florian Achleitner
transport-helpers can advertise the 'refspec' capability, if not a default refspec *:* is assumed. This explains the post-processing of refs after fetching with fast-import. Signed-off-by: Florian Achleitner --- transport-helper.c | 15 +++ 1 file changed, 15 insertions(+) diff --

Re: [RFC 1/4 v2] Implement a basic remote helper for svn in C.

2012-07-30 Thread Florian Achleitner
On Monday 30 July 2012 03:29:52 Jonathan Nieder wrote: > > Generally I like your prefered solution. > > I think there's one problem: > > The pipe needs to be created before the fork, so that the fd can be > > inherited. > The relevant pipe already exists at that point: the remote helper's > stdin.

Re: inconsistent logs when displayed on screen / piped to a file

2012-07-30 Thread Carlos Martín Nieto
On Mon, 2012-07-30 at 15:39 +0200, Michael J Gruber wrote: > a) probes your terminal for the number of columns and uses all available > space. > > b) goes to a file and has no connected terminal, thus uses a default > column number. You can change that number using > > COLUMNS=YourNumber git log

Re: inconsistent logs when displayed on screen / piped to a file

2012-07-30 Thread Michael J Gruber
Mojca Miklavec venit, vidit, dixit 30.07.2012 14:25: > Hello, > > I'm trying to use "git log" to generate ChangeLog for a project > recently migrated from CVS. > > The problem is that > git log --summary --stat --no-merges --date=short --decorate=short > behaves differently when the result is

Re: The GitTogether

2012-07-30 Thread Michael J Gruber
Jens Lehmann venit, vidit, dixit 29.07.2012 17:55: > Am 27.07.2012 13:45, schrieb Thomas Rast: >> Scott Chacon writes: >> >>> GitHub would like to volunteer to organize and pay for these events >>> this year. I would like to hold the developer-centric one in Berlin >>> in early October Winter te

Re: A new way to get a sha1?

2012-07-30 Thread Sitaram Chamarty
On Mon, Jul 30, 2012 at 5:41 PM, Thomas Badie wrote: > Hi all, > > When I should fixup or squash a commit, I nearly never > remember how to get the sha1 of the commit I want to fixup. > Because sometimes HEAD~n is not enough, I make `git log`, > copy the sha1 of the right commit and paste it in my

Re: bug (?) in send email

2012-07-30 Thread Thomas Rast
[+Cc people involved with this function] Christoph Miebach writes: > > git commit --author="Michał Tz " modified.file -m > > "Test" > > > > git format-patch -o patches origin > > > > Now, the patch seems to have the address right, see [1] > > > > git send-email --to myown.addr...@mail.com --sup

Re: A new way to get a sha1?

2012-07-30 Thread Jan Engelhardt
On Monday 2012-07-30 14:11, Thomas Badie wrote: >Hi all, > >When I should fixup or squash a commit, I nearly never >remember how to get the sha1 of the commit I want to fixup. >Because sometimes HEAD~n is not enough, I make `git log`, >copy the sha1 of the right commit and paste it in my git >fixu

Re: [PATCH] buitin_config: return postitive status in get_value

2012-07-30 Thread Nguyen Thai Ngoc Duy
On Mon, Jul 30, 2012 at 3:43 AM, Junio C Hamano wrote: > +. You use '--global' option without $HOME being properly set (ret=128), > +. Any other errors (ret=7). To be pedantic, ret=128 is a result of die() and not setting $HOME is just one of them. There's also ret=129 for usage(), which is not d

inconsistent logs when displayed on screen / piped to a file

2012-07-30 Thread Mojca Miklavec
Hello, I'm trying to use "git log" to generate ChangeLog for a project recently migrated from CVS. The problem is that git log --summary --stat --no-merges --date=short --decorate=short behaves differently when the result is displayed on screen and when it is piped to a file. For example, ru

A new way to get a sha1?

2012-07-30 Thread Thomas Badie
Hi all, When I should fixup or squash a commit, I nearly never remember how to get the sha1 of the commit I want to fixup. Because sometimes HEAD~n is not enough, I make `git log`, copy the sha1 of the right commit and paste it in my git fixup command. So I wrote a perl script to avoid the usage o

Re: bug (?) in send email

2012-07-30 Thread Christoph Miebach
Hello! Removing this line s/_/ /g; here https://github.com/git/git/blob/master/git-send-email.perl#L867 Solves this problem for me. But I really don't have any clue, what kind of side effects this modification on "sub unquote_rfc2047" might have. Regards Christoph On 28.07.2012 23:33, Chris

Email to Matt Zimmerman

2012-07-30 Thread Canonical
Hi, Thank you for your email addressed to Matt Zimmerman. After 7 years extraordinary years at Canonical, Matt has moved on to a new project. For Ubuntu / Canonical related issues: * Ubuntu development - Rick Spencer - rick.spen...@canonical.com * Commercial alliances / opportunities - Chris Ke

[PATCHv2 5/5] t3910: use the UTF8_NFD_TO_NFC test prereq

2012-07-30 Thread Michael J Gruber
Besides reusing the new test prerequisite, this fixes also the issue that the current output is not TAP compliant and produces the output "no reason given" [for skipping]. Signed-off-by: Michael J Gruber --- Same patch, new subject line which matches the actual patch. Yeah. t/t3910-mac-os-preco

Re: [PATCH 0/5] test-lib: filesystem prerequisites

2012-07-30 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 27.07.2012 19:29: > Michael J Gruber writes: > >> 5/5 needs a fix in the subject line, sorry. It should be: >> >> t3910: use the UTF8_NFD_TO_NFC test prereq >> >> (5/5 hasn't hit next) > > That is because I thought that you would like the lazy-probe and > that

Re: PROPFIND 405 with git-http-backend and Smart HTTP

2012-07-30 Thread Bo98
Shawn Pearce wrote > >> And here's a snip from my access_log: >> >> ::1 - - [29/Jul/2012:18:34:34 +0100] "GET >> /repo/myproject.git/info/refs?service=git-receive-pack HTTP/1.1" 200 117 > > Was this request actually served using the smart http-backend? Try the > request yourself on the comma

Re: Enhancements to git-protocoll

2012-07-30 Thread Sitaram Chamarty
On Mon, Jul 30, 2012 at 11:58 AM, Junio C Hamano wrote: > Shawn Pearce writes: > >>> The way to expose the extra information parsed by Git to the server >>> side could be made into calling out to hooks, and at that point, >>> gitolite would not even have to know about the pack protocol. >> >> Goo

Re: [RFC 1/4 v2] Implement a basic remote helper for svn in C.

2012-07-30 Thread Jonathan Nieder
Florian Achleitner wrote: > On Saturday 28 July 2012 02:00:31 Jonathan Nieder wrote: >> a. use --cat-blob-fd, no FIFO [...] >>* Make it conditional --- only do it (1) we are not on Windows and >> (2) the remote helper requests backflow by advertising the >> import-bidi capability. >>

Re: [RFC 1/4 v2] Implement a basic remote helper for svn in C.

2012-07-30 Thread Florian Achleitner
On Thursday 26 July 2012 10:29:51 Junio C Hamano wrote: > Of course, if the dispatch loop has to be rewritten so that a > central dispatcher decides what to call, individual input handlers > do not need to say NOT_HANDLED nor TERMINATE, as the central > dispatcher should keep track of the overall s

Re: Enhancements to git-protocoll

2012-07-30 Thread Sitaram Chamarty
On Mon, Jul 30, 2012 at 11:58 AM, Junio C Hamano wrote: > Heh. While I do not particularly consider auto-creation-upon-push a > useful thing to begin with (after all, once you created a > repository, you would want ways to manage it, setting up ACL for it [side point] these things are managed w

Re: [RFC 1/4 v2] Implement a basic remote helper for svn in C.

2012-07-30 Thread Florian Achleitner
On Saturday 28 July 2012 02:00:31 Jonathan Nieder wrote: > Thanks for explaining. Now we've discussed a few different approproaches, > none of which is perfect. > > a. use --cat-blob-fd, no FIFO > >Doing this unconditionally would break platforms that don't support >--cat-blob-fd=(descri