Re: [PATCH] http-backend: provide Allow header for 405

2013-09-10 Thread Jeff King
On Sun, Sep 08, 2013 at 06:15:06PM +, brian m. carlson wrote: The HTTP 1.1 standard requires an Allow header for 405 Method Not Allowed: The response MUST include an Allow header containing a list of valid methods for the requested resource. So provide such a header when we return

Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode

2013-09-10 Thread Felipe Contreras
On Mon, Sep 9, 2013 at 9:21 PM, Jeff King p...@peff.net wrote: On Mon, Sep 09, 2013 at 05:49:36PM -0500, Felipe Contreras wrote: These deprecation warning messages should be written to stderr, and should probably be prefixed with WARNING: . Is there any deprecation warning that works this

Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode

2013-09-10 Thread Jeff King
On Tue, Sep 10, 2013 at 01:46:27AM -0500, Felipe Contreras wrote: On Mon, Sep 9, 2013 at 9:21 PM, Jeff King p...@peff.net wrote: On Mon, Sep 09, 2013 at 05:49:36PM -0500, Felipe Contreras wrote: These deprecation warning messages should be written to stderr, and should probably be

Re: [PATCH] GIT-VERSION-GEN: Do not require tags to be annotated

2013-09-10 Thread Sebastian Schuberth
On Sun, Sep 8, 2013 at 7:41 PM, Junio C Hamano gits...@pobox.com wrote: Which raises another question on my side: Isn't it tedious for you to both update DEF_VER *and* tag a version? Wouldn't it probably be less error prove (in the sense of keeping DEF_VER and tagged version in sync) to

Re: [PATCH 0/3] Reject non-ff pulls by default

2013-09-10 Thread John Keeping
On Mon, Sep 09, 2013 at 06:02:35PM -0500, Felipe Contreras wrote: On Mon, Sep 9, 2013 at 3:24 PM, John Keeping j...@keeping.me.uk wrote: On Mon, Sep 09, 2013 at 03:52:31PM -0400, Jeff King wrote: On Mon, Sep 09, 2013 at 11:47:45AM -0700, Junio C Hamano wrote: You are in favor of an

Re: What's cooking in git.git (Sep 2013, #02; Mon, 9)

2013-09-10 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: * mm/rebase-continue-freebsd-WB (2013-09-09) 1 commit - rebase: fix run_specific_rebase's use of return on FreeBSD Work around a bug in FreeBSD shell that caused a regression to git rebase in v1.8.4. It would be lovely to hear from FreeBSD folks a

Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode

2013-09-10 Thread Matthieu Moy
Felipe Contreras felipe.contre...@gmail.com writes: On Mon, Sep 9, 2013 at 9:21 PM, Jeff King p...@peff.net wrote: On Mon, Sep 09, 2013 at 05:49:36PM -0500, Felipe Contreras wrote: These deprecation warning messages should be written to stderr, and should probably be prefixed with WARNING:

Re: [PATCH 0/3] Reject non-ff pulls by default

2013-09-10 Thread Matthieu Moy
Felipe Contreras felipe.contre...@gmail.com writes: The problem is the newcomers, and the newcomers will most definitely not activate a configuration option to tell them that they are doing something potentially undesirable. I teach Git to 200 newcommers each year. All of them run git pull

Re: [Proposal] Clonable scripts

2013-09-10 Thread Niels Basjes
Hi, On Tue, Sep 10, 2013 at 12:18 AM, Ramkumar Ramachandra artag...@gmail.com wrote: Niels Basjes wrote: As we all know the hooks ( in .git/hooks ) are not cloned along with the code of a project. Now this is a correct approach for the scripts that do stuff like emailing the people

[RFC] Disabling status hints in COMMIT_EDITMSG

2013-09-10 Thread Matthieu Moy
Hi, I just noticed that the template COMMIT_EDITMSG was containing status hints, and that they were not particularty helpfull _during_ a commit. I think it would be sensible to ignore advice.statusHints and disable hints unconditionally when writting to COMMIT_EDITMSG. Any objection? --

Re: [Proposal] Clonable scripts

2013-09-10 Thread Sitaram Chamarty
On 09/10/2013 02:18 AM, Niels Basjes wrote: As we all know the hooks ( in .git/hooks ) are not cloned along with the code of a project. Now this is a correct approach for the scripts that do stuff like emailing the people responsible for releases or submitting the commit to a CI system.

Re: [RFC] Disabling status hints in COMMIT_EDITMSG

2013-09-10 Thread Chris Packham
On 10/09/13 21:19, Matthieu Moy wrote: Hi, I just noticed that the template COMMIT_EDITMSG was containing status hints, and that they were not particularty helpfull _during_ a commit. I think it would be sensible to ignore advice.statusHints and disable hints unconditionally when writting

Re: [PATCH] GIT-VERSION-GEN: Do not require tags to be annotated

2013-09-10 Thread Felipe Contreras
On Tue, Sep 10, 2013 at 3:06 AM, Sebastian Schuberth sschube...@gmail.com wrote: On Sun, Sep 8, 2013 at 7:41 PM, Junio C Hamano gits...@pobox.com wrote: a case where you have your own tag that points at the exact version as I tagged? In such a case, do you have a preference on which tag No.

Re: [RFC] Disabling status hints in COMMIT_EDITMSG

2013-09-10 Thread Matthieu Moy
Chris Packham judge.pack...@gmail.com writes: On 10/09/13 21:19, Matthieu Moy wrote: Hi, I just noticed that the template COMMIT_EDITMSG was containing status hints, and that they were not particularty helpfull _during_ a commit. I think it would be sensible to ignore advice.statusHints

Re: [Proposal] Clonable scripts

2013-09-10 Thread Andreas Krey
On Mon, 09 Sep 2013 22:48:42 +, Niels Basjes wrote: ... However I can imagine that a malicious opensource coder can create a github repo and try to hack the computer of a contributer via those scripts. So having such scripts is a 'bad idea'. Given that half the repos out there are cloned

push.default=upstream doesn't play nicely with remote.pushdefault/branch.*.pushremote

2013-09-10 Thread Ximin Luo
(Please CC me as I am not subscribed.) $ git config -l | grep '^branch.master\|^push.' push.default=upstream branch.master.remote=upstream branch.master.merge=refs/heads/master branch.master.pushremote=origin $ git branch * master $ git push fatal: You are pushing to remote 'origin', which is

Regression in e02ca72: git svn rebase is broken on Windows

2013-09-10 Thread Tvangeste
Hi, After bisecting this problem I ended up with the mentioned commit that completely breaks git-svn for me on Windows (mingw/msys version). == # git svn rebase warning: unable to access '': Invalid argument warning: unable to access '': Invalid argument fatal: unable to access

Re-Transmission of blobs?

2013-09-10 Thread Josef Wolf
Hello, as we all know, files are identified by their SHA. Thus I had the impression that when transfering files, git would know by the SHA whether a given file is already available in the destination repository and the transfer would be of no use. But this don't seem to be tha case. Lets see this

git-cvsserver strips exec bit

2013-09-10 Thread Michael Cronenworth
Hello, On git 1.8.1.x (Fedora 18) I was able to use the git-cvsserver to checkout code to package into a tarball. Script files that were in git with 755 masks were checked-out with the same mask. After upgrading the git repository machine to Fedora 19 (1.8.3.1) the behaviour has changed. When I

Re: Regression in e02ca72: git svn rebase is broken on Windows

2013-09-10 Thread Johannes Schindelin
Hi Tvangeste, On Tue, 10 Sep 2013, Tvangeste wrote: After bisecting this problem I ended up with the mentioned commit that completely breaks git-svn for me on Windows (mingw/msys version). Have you tried with Git for Windows yet? Ciao, Johannes -- To unsubscribe from this list: send the line

Re: push.default=upstream doesn't play nicely with remote.pushdefault/branch.*.pushremote

2013-09-10 Thread Junio C Hamano
Ximin Luo infini...@gmx.com writes: (Please CC me as I am not subscribed.) $ git config -l | grep '^branch.master\|^push.' push.default=upstream branch.master.remote=upstream branch.master.merge=refs/heads/master branch.master.pushremote=origin $ git branch * master $ git push fatal:

Re: [PATCH] GIT-VERSION-GEN: Do not require tags to be annotated

2013-09-10 Thread Junio C Hamano
Sebastian Schuberth sschube...@gmail.com writes: Right, but do we really need DEF_VER *and* version? Couldn't we just package official source tarballs in a way that they already contain an auto-generated version file? If you read our Makefile, you will see that we do include the version file

Re: What's cooking in git.git (Sep 2013, #02; Mon, 9)

2013-09-10 Thread Jens Lehmann
Am 10.09.2013 00:53, schrieb Junio C Hamano: * bc/submodule-status-ignored (2013-09-04) 2 commits - submodule: don't print status output with ignore=all - submodule: fix confusing variable name Originally merged to 'next' on 2013-08-22 Will merge to 'next'. I propose to cook this

Re: [PATCH v6 0/8] Multiple simultaneously locked ref updates

2013-09-10 Thread Junio C Hamano
Brad King brad.k...@kitware.com writes: Updates since the previous revision of the series: * The entire series was rebased on master at bb80ee09; it was previously based on v1.8.4. * A conflict in refs.c with 47a59185 was resolved by preserving the elimination of find_ref_by_name while

[PATCH 12/14] reduce confusion over smart server response behaviour

2013-09-10 Thread Tay Ray Chuan
The MUST and the following 'If' scenario may seem contradictory at first glance; swap their order to alleviate this. Also mention that the response should specifically be for the requested service, for clarity's sake. Based on: From: Junio C Hamano gits...@pobox.com Message-ID:

Re: [RFC] Disabling status hints in COMMIT_EDITMSG

2013-09-10 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Hi, I just noticed that the template COMMIT_EDITMSG was containing status hints, and that they were not particularty helpfull _during_ a commit. I think it would be sensible to ignore advice.statusHints and disable hints unconditionally when

[PATCH 02/14] normalize indentation with protcol-common.txt

2013-09-10 Thread Tay Ray Chuan
Indent client/server query examples with 3 spaces. Indent ABNF rules with 2 spaces. Signed-off-by: Tay Ray Chuan rcta...@gmail.com -- This is in its own patch to minimize noise in diffs. --- Documentation/technical/http-protocol.txt | 226 +++--- 1 file changed, 113

[PATCH 05/14] drop rules, etc. common to the pack protocol

2013-09-10 Thread Tay Ray Chuan
Use obj-id in lieu of id (defined as 40*HEX). Use zero-id in lieu of 40*0. Use refname in lieu of name (not defined). Drop section on capabilities, since they are already available in protocol-capabilities.txt. Signed-off-by: Tay Ray Chuan rcta...@gmail.com -- pkt-line format section was

[PATCH 08/14] mention different variations around $GIT_URL

2013-09-10 Thread Tay Ray Chuan
Based on From: Alex Blewitt alex.blew...@gmail.com Message-ID: loom.20091009t104530-...@post.gmane.org Shawn O. Pearce spearce at spearce.org writes: +URL Format +-- + +URLs for Git repositories accessed by HTTP use the standard HTTP +URL syntax documented by RFC

breakage in revision traversal with pathspec

2013-09-10 Thread Junio C Hamano
I am grumpy X-. It appears that we introduced a large breakage during 1.8.4 cycle to the revision traversal machinery and made pathspec-limited git log pretty much useless. This command $ git log v1.8.3.1..v1.8.4 -- git-cvsserver.perl reports that a merge 766f0f8ef7 (which did not touch

[PATCH 11/14] be clearer in place of 'remote repository' phrase

2013-09-10 Thread Tay Ray Chuan
Based on: From: Junio C Hamano gits...@pobox.com Message-ID: 7vskdss3ei@alter.siamese.dyndns.org +Smart Service git-upload-pack +-- +This service reads from the remote repository. The wording remote repository felt confusing. I know it is from

[PATCH 10/14] fix example request/responses

2013-09-10 Thread Tay Ray Chuan
Add LF for responses. For smart interactions, add pkt-line lengths and the flush-pkt () line. Drop the SP that followed NUL before capability list. Signed-off-by: Tay Ray Chuan rcta...@gmail.com --- Documentation/technical/http-protocol.txt | 35 --- 1 file

[PATCH 14/14] mention effect of allow-tip-sha1-in-want capability on git-upload-pack

2013-09-10 Thread Tay Ray Chuan
From: Nguyễn Thái Ngọc Duy pclo...@gmail.com Signed-off-by: Tay Ray Chuan rcta...@gmail.com Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com -- Subject crafted by Ray Chuan, Nguyễn's s-o-b lifted from 1377092713-25434-1-git-send-email-pclo...@gmail.com. ---

[PATCH 03/14] capitalize key words according to RFC 2119

2013-09-10 Thread Tay Ray Chuan
Signed-off-by: Tay Ray Chuan rcta...@gmail.com --- Documentation/technical/http-protocol.txt | 17 +++-- 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Documentation/technical/http-protocol.txt b/Documentation/technical/http-protocol.txt index 70a1648..55753bb 100644

Re: Regression in e02ca72: git svn rebase is broken on Windows

2013-09-10 Thread Johannes Sixt
Am 10.09.2013 15:14, schrieb Tvangeste: After bisecting this problem I ended up with the mentioned commit that completely breaks git-svn for me on Windows (mingw/msys version). == # git svn rebase warning: unable to access '': Invalid argument warning: unable to access '': Invalid

Re: git-cvsserver strips exec bit

2013-09-10 Thread Junio C Hamano
Michael Cronenworth m...@cchtml.com writes: On git 1.8.1.x (Fedora 18) I was able to use the git-cvsserver to checkout code to package into a tarball. Script files that were in git with 755 masks were checked-out with the same mask. After upgrading the git repository machine to Fedora 19

[PATCH 00/14] document edits to original http protocol documentation

2013-09-10 Thread Tay Ray Chuan
This patch series are the changes based on the discussion on Shawn's original text [1]. Some of them are minor, while some may potentially change behaviour; see below for a classification of the changes. Hopefully they can be examined by the git contributors here. An earlier iteration of this

[PATCH 06/14] reword behaviour on missing repository or objects

2013-09-10 Thread Tay Ray Chuan
From: Shawn O. Pearce spea...@spearce.org Signed-off-by: Tay Ray Chuan rcta...@gmail.com -- To Shawn: sign-off-by needed. Based on: From: Shawn O. Pearce spea...@spearce.org Message-ID: 20091016142135.gr10...@spearce.org Mike Hommey m...@glandium.org wrote: On Thu, Oct 15, 2009 at

Re: Regression in e02ca72: git svn rebase is broken on Windows

2013-09-10 Thread Junio C Hamano
Tvangeste i.4m.l...@yandex.ru writes: Hi, After bisecting this problem I ended up with the mentioned commit that completely breaks git-svn for me on Windows (mingw/msys version). == # git svn rebase warning: unable to access '': Invalid argument warning: unable to access '':

[PATCH 04/14] normalize rules with RFC 5234

2013-09-10 Thread Tay Ray Chuan
Drop LF, SP which are defined in RFC 5234. Replace HT with HTAB (also defined in the RFC). Use '/' instead of '|', as the RFC does. Signed-off-by: Tay Ray Chuan rcta...@gmail.com --- Documentation/technical/http-protocol.txt | 26 +- 1 file changed, 9 insertions(+), 17

Re: [PATCH v6 0/8] Multiple simultaneously locked ref updates

2013-09-10 Thread Brad King
On 09/10/2013 12:30 PM, Junio C Hamano wrote: Thanks. I am not sure if I should rewind and rebuild the series with these patches, though. This is a new feature and does not have to be merged to 'maint', so rebasing is perfectly fine, but it is not strictly necessary, either. I just thought

[PATCH 01/14] Document the HTTP transport protocol

2013-09-10 Thread Tay Ray Chuan
From: Shawn O. Pearce spea...@spearce.org Signed-off-by: Shawn O. Pearce spea...@spearce.org Signed-off-by: Tay Ray Chuan rcta...@gmail.com -- This is the original 1255065768-10428-2-git-send-email-spea...@spearce.org with some minor changes, as follows: - fix mis-spelling 'paramterized' -

Re: Re-Transmission of blobs?

2013-09-10 Thread Junio C Hamano
Josef Wolf j...@raven.inka.de writes: as we all know, files are identified by their SHA. Thus I had the impression that when transfering files, git would know by the SHA whether a given file is already available in the destination repository and the transfer would be of no use. That is

Re: Regression in e02ca72: git svn rebase is broken on Windows

2013-09-10 Thread Tvangeste
10.09.2013, 18:13, Johannes Schindelin johannes.schinde...@gmx.de: Have you tried with Git for Windows yet? What's Git for Windows? If you mean msysgit, then I say no, because the latest msysgit version is from June 02, and the change under discussion was made later on, on June 25th. So, this

Re: Regression in e02ca72: git svn rebase is broken on Windows

2013-09-10 Thread Tvangeste
10.09.2013, 18:53, Johannes Sixt j...@kdbg.org: Can you please run the command with GIT_TRACE=2? Sure: # git --version trace: built-in: git 'version' git version 1.8.4.242.gbb80ee0 # git svn rebase -l trace: exec: 'git-svn' 'rebase' '-l' trace: run_command: 'git-svn' 'rebase' '-l' trace:

Re: Regression in e02ca72: git svn rebase is broken on Windows

2013-09-10 Thread Johannes Schindelin
Hi Tvangeste, On Tue, 10 Sep 2013, Tvangeste wrote: 10.09.2013, 18:13, Johannes Schindelin johannes.schinde...@gmx.de: Have you tried with Git for Windows yet? What's Git for Windows? If you mean msysgit, Actually, they are two different things: Git for Windows is what the name says, and

Re: [RFC] Disabling status hints in COMMIT_EDITMSG

2013-09-10 Thread Jonathan Nieder
Matthieu Moy wrote: I just noticed that the template COMMIT_EDITMSG was containing status hints, and that they were not particularty helpfull _during_ a commit. I think it would be sensible to ignore advice.statusHints and disable hints unconditionally when writting to COMMIT_EDITMSG. Any

Re: What's cooking in git.git (Sep 2013, #02; Mon, 9)

2013-09-10 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Junio C Hamano gits...@pobox.com writes: * mm/rebase-continue-freebsd-WB (2013-09-09) 1 commit - rebase: fix run_specific_rebase's use of return on FreeBSD Work around a bug in FreeBSD shell that caused a regression to git rebase in

[PATCH 1/2] reset: handle submodule with trailing slash

2013-09-10 Thread John Keeping
When using tab-completion, a directory path will often end with a trailing slash which currently confuses git rm when dealing with submodules. Now that we have parse_pathspec we can easily handle this by simply adding the PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP flag. Signed-off-by: John Keeping

[PATCH 2/2] rm: re-use parse_pathspec's trailing-slash removal

2013-09-10 Thread John Keeping
Instead of re-implementing the remove trailing slashes loop in builtin/rm.c just pass PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP to parse_pathspec. Signed-off-by: John Keeping j...@keeping.me.uk --- builtin/rm.c | 20 1 file changed, 4 insertions(+), 16 deletions(-) diff --git

[PATCH 0/2] reset: handle submodule with trailing slash

2013-09-10 Thread John Keeping
The first patch is the important one here, the second one I noticed while checking if any other commands fail to handle submodule paths with a trailing slash and is just a simplification. John Keeping (2): reset: handle submodule with trailing slash rm: re-use parse_pathspec's trailing-slash

Re: git-cvsserver strips exec bit

2013-09-10 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Michael Cronenworth m...@cchtml.com writes: On git 1.8.1.x (Fedora 18) I was able to use the git-cvsserver to checkout code to package into a tarball. Script files that were in git with 755 masks were checked-out with the same mask. After upgrading

Re: [PATCH 1/2] reset: handle submodule with trailing slash

2013-09-10 Thread John Keeping
On Tue, Sep 10, 2013 at 09:37:45PM +0200, Jens Lehmann wrote: Am 10.09.2013 21:13, schrieb John Keeping: When using tab-completion, a directory path will often end with a trailing slash which currently confuses git rm when dealing with I think you meant to say git reset in the line above.

Re: pack v4 trees with a canonical base

2013-09-10 Thread Nicolas Pitre
On Tue, 10 Sep 2013, Junio C Hamano wrote: Duy Nguyen pclo...@gmail.com writes: On Tue, Sep 10, 2013 at 2:25 AM, Nicolas Pitre n...@fluxnic.net wrote: An eventual optimization to index-pack when completing a pack would be to attempt the encoding of appended tree objects into the packv4

Re: [PATCH] GIT-VERSION-GEN: Do not require tags to be annotated

2013-09-10 Thread Sebastian Schuberth
On Tue, Sep 10, 2013 at 5:59 PM, Junio C Hamano gits...@pobox.com wrote: string to that file before building, so in that sense, we do not *need* DEF_VER and version. But they have been there for a long time, and I do not think it gives us a good trade-off between risking regression and

Re: [PATCH v6 0/8] Multiple simultaneously locked ref updates

2013-09-10 Thread Junio C Hamano
Brad King brad.k...@kitware.com writes: On 09/10/2013 12:30 PM, Junio C Hamano wrote: Thanks. I am not sure if I should rewind and rebuild the series with these patches, though. This is a new feature and does not have to be merged to 'maint', so rebasing is perfectly fine, but it is not

Re: Regression in e02ca72: git svn rebase is broken on Windows

2013-09-10 Thread Tvangeste
10.09.2013, 20:02, Johannes Schindelin johannes.schinde...@gmx.de:  Given the explanation what msysGit is, you might suspect that I'd like you  to try to fix this in the msysGit context: After installing  https://code.google.com/p/msysgit/downloads/list?q=net+installer No problem.

Re: pack v4 trees with a canonical base

2013-09-10 Thread Junio C Hamano
Nicolas Pitre n...@fluxnic.net writes: very much appreciated to On Tue, 10 Sep 2013, Junio C Hamano wrote: Duy Nguyen pclo...@gmail.com writes: On Tue, Sep 10, 2013 at 2:25 AM, Nicolas Pitre n...@fluxnic.net wrote: An eventual optimization to index-pack when completing a pack would be

Re: pack v4 trees with a canonical base

2013-09-10 Thread Nicolas Pitre
On Tue, 10 Sep 2013, Junio C Hamano wrote: Nicolas Pitre n...@fluxnic.net writes: On Tue, 10 Sep 2013, Junio C Hamano wrote: There may be trees in the wild that record 100775 or 100777 in the mode field for executable blobs, which also need to be special cased. All the file mode

Re: [PULL REQUEST] initial pack v4 support

2013-09-10 Thread Junio C Hamano
Nicolas Pitre n...@fluxnic.net writes: Junio, would you please pull the following into pu: git://git.linaro.org/people/nico/git This is the pack v4 work to date which is somewhat getting usable. It is time it gets more exposure, and possibly some more people's attention who would

Re: [PULL REQUEST] initial pack v4 support

2013-09-10 Thread Nicolas Pitre
On Tue, 10 Sep 2013, Junio C Hamano wrote: Nicolas Pitre n...@fluxnic.net writes: Junio, would you please pull the following into pu: git://git.linaro.org/people/nico/git This is the pack v4 work to date which is somewhat getting usable. It is time it gets more exposure, and

Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode

2013-09-10 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: Also 'branch.name.rebase' to 'branch.name.pullmode'. This way 'pull.mode' can be set to 'merge', and the default can be something else. The old configurations still work, but get deprecated. Sounds good, but we should still mention these

Re: git-cvsserver strips exec bit

2013-09-10 Thread Michael Cronenworth
Junio C Hamano wrote: I stopped interacting with CVS quite a long time ago, so I do not have any way of verifying, but the fix may be just the matter of something like this. This fix is close. Now all files are checked out with a mask of 555. -- To unsubscribe from this list: send the line

Re: Regression in e02ca72: git svn rebase is broken on Windows

2013-09-10 Thread Karsten Blees
Junio C Hamano gitster at pobox.com writes: Tvangeste i.4m.l33t at yandex.ru writes: Hi, After bisecting this problem I ended up with the mentioned commit that completely breaks git-svn for me on Windows (mingw/msys version). == # git svn rebase warning: unable to

Re: [PULL REQUEST] initial pack v4 support

2013-09-10 Thread Junio C Hamano
Nicolas Pitre n...@fluxnic.net writes: On Tue, 10 Sep 2013, Junio C Hamano wrote: Nicolas Pitre n...@fluxnic.net writes: Junio, would you please pull the following into pu: git://git.linaro.org/people/nico/git This is the pack v4 work to date which is somewhat getting usable.

Re: git-cvsserver strips exec bit

2013-09-10 Thread Michael Cronenworth
Michael Cronenworth wrote: This fix is close. Now all files are checked out with a mask of 555. Let me clarify. Git mask 755 = CVS mask 555 Git mask 644 = CVS mask 444 Thanks, Michael -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [PATCH v2] remote-bzr: reuse bzrlib transports when possible

2013-09-10 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Richard Hansen rhan...@bbn.com writes: def do_export(parser): -global parsed_refs, dirname +global parsed_refs, dirname, transports As this has been acked by Felipe who knows the script the best, I'll apply this directly to 'master'.

Re: breakage in revision traversal with pathspec

2013-09-10 Thread Junio C Hamano
Kevin Bracey ke...@bracey.fi writes: On 10/09/2013 20:19, Junio C Hamano wrote: I am grumpy X-. It appears that we introduced a large breakage during 1.8.4 cycle to the revision traversal machinery and made pathspec-limited git log pretty much useless. This command $ git log

Re: [PATCH 0/3] Reject non-ff pulls by default

2013-09-10 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Junio C Hamano gits...@pobox.com writes: You are in favor of an _option_ to allow people to forbid a pull in a non-ff situation, and I think other people are also in agreement. Yes. Having an option can't harm anybody, and there's a clear

Re: [PATCH v5 2/2] Add new @ shortcut for HEAD

2013-09-10 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Felipe Contreras felipe.contre...@gmail.com writes: Hmph, is the above sufficient? I added a case that mimics Stefano's original regression report (which is handled) and another that uses doubled @ for the same purpose of introducing a funny

[PATCH] lookup_object: remove hashtable_index() and optimize hash_obj()

2013-09-10 Thread Nicolas Pitre
hashtable_index() appears to be a close duplicate of hash_obj(). Keep only the later and make it usable for all cases. Also remove the modulus as this is an expansive operation. The size argument is always a power of 2 anyway, so a simple mask operation provides the same result. On a 'git

Re: [PULL REQUEST] initial pack v4 support

2013-09-10 Thread Nicolas Pitre
On Tue, 10 Sep 2013, Junio C Hamano wrote: packv4-parse.c: allow tree entry copying from a canonical tree object This one needed a small fix-up to make it compile. I do not particularly like reusing that size variable, but it seemed to be dead at that point, so...

Re: git-cvsserver strips exec bit

2013-09-10 Thread Junio C Hamano
Michael Cronenworth m...@cchtml.com writes: Michael Cronenworth wrote: This fix is close. Now all files are checked out with a mask of 555. Let me clarify. Git mask 755 = CVS mask 555 Git mask 644 = CVS mask 444 Thanks, Michael Then what I wrote was actually relevant ;-) I am not

Re: [PATCH v6 8/8] update-ref: add test cases covering --stdin signature

2013-09-10 Thread Junio C Hamano
Eric Sunshine sunsh...@sunshineco.com writes: Thus printf provides all the functionality you require, and print_nul() function can be dropped. So: printf '%s\0' foo bar baz is equivalent to: print_null foo bar baz Good eyes. Thanks, I missed them when I looked at the patches. --

Re: [PATCH v6 7/8] update-ref: support multiple simultaneous updates

2013-09-10 Thread Eric Sunshine
On Mon, Sep 9, 2013 at 8:57 PM, Brad King brad.k...@kitware.com wrote: diff --git a/Documentation/git-update-ref.txt b/Documentation/git-update-ref.txt index 0df13ff..0a0a551 100644 --- a/Documentation/git-update-ref.txt +++ b/Documentation/git-update-ref.txt @@ -58,6 +58,58 @@ archive by

[PATCH-v3] Allow git-filter-branch to process large repositories with lots of branches.

2013-09-10 Thread Lee Carver
As noted in several forums, a recommended way to move trees between repositories is to use git-filter-branch to revise the history for a single tree: http://gbayer.com/development/moving-files-from-one-git-repository-to-anoth er-preserving-history/

Re: [PATCH-v3] Allow git-filter-branch to process large repositories with lots of branches.

2013-09-10 Thread Junio C Hamano
Lee Carver lee.car...@servicenow.com writes: As noted in several forums, a recommended way to move trees between repositories is to use git-filter-branch to revise the history for a single tree: http://gbayer.com/development/moving-files-from-one-git-repository-to-anoth

[PATCH 0/3] Fix MSVC compile errors and cleanup stat definitions

2013-09-10 Thread Karsten Blees
A few minor fixes for the MSVC build. Also here: https://github.com/kblees/git/tree/kb/fix-msvc-stat-definitions Karsten Blees (3): MSVC: fix compile errors due to missing libintl.h MSVC: fix compile errors due to macro redefinitions MSVC: fix stat definition hell compat/mingw.h | 21

[PATCH 1/3] MSVC: fix compile errors due to missing libintl.h

2013-09-10 Thread Karsten Blees
Set NO_GETTEXT in config.mak.uname to get rid of libintl.h dependency. Signed-off-by: Karsten Blees bl...@dcon.de --- config.mak.uname | 1 + 1 file changed, 1 insertion(+) diff --git a/config.mak.uname b/config.mak.uname index b27f51d..64b7f49 100644 --- a/config.mak.uname +++

[PATCH 2/3] MSVC: fix compile errors due to macro redefinitions

2013-09-10 Thread Karsten Blees
Skip errno.h definitions if they are already defined. Signed-off-by: Karsten Blees bl...@dcon.de --- compat/mingw.h | 6 ++ 1 file changed, 6 insertions(+) diff --git a/compat/mingw.h b/compat/mingw.h index bd0a88b..6b531e4 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -32,7 +32,9 @@

[PATCH 3/3] MSVC: fix stat definition hell

2013-09-10 Thread Karsten Blees
In msvc.h, there's a couple of stat related functions defined diffently from mingw.h. When we remove these definitions, the only problem we get is warning C4005: '_stati64' : macro redefinition for this line in mingw.h: #define _stati64(x,y) mingw_stat(x,y) The reason is that as of MSVCR80.dll

[PATCH/RFC 0/5] New hash table implementation

2013-09-10 Thread Karsten Blees
Also here: https://github.com/kblees/git/tree/kb/hashmap Hi, this is a spin-off of my (very slowly progressing) msysgit fscache project. I needed to remove things from the hash table, which cannot be implemented efficiently in hash.[ch]. So I wrote hasmap.[ch], with these features: - O(1)

[PATCH/RFC 1/5] add a hashtable implementation that supports O(1) removal

2013-09-10 Thread Karsten Blees
The existing hashtable implementation (in hash.[ch]) uses open addressing (i.e. resolve hash collisions by distributing entries across the table). Thus, removal is difficult to implement with less than O(n) complexity. Resolving collisions of entries with identical hashes (e.g. via chaining) is

[PATCH/RFC 2/5] buitin/describe.c: use new hash map implementation

2013-09-10 Thread Karsten Blees
Signed-off-by: Karsten Blees bl...@dcon.de --- builtin/describe.c | 53 - 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/builtin/describe.c b/builtin/describe.c index 7d73722..bbc7159 100644 --- a/builtin/describe.c +++

[PATCH/RFC 3/5] diffcore-rename.c: move code around to prepare for the next patch

2013-09-10 Thread Karsten Blees
No actual code changes, just move hash_filespec up and outdent part of find_identical_files. Signed-off-by: Karsten Blees bl...@dcon.de --- diffcore-rename.c | 98 +++ 1 file changed, 49 insertions(+), 49 deletions(-) diff --git

[PATCH/RFC 5/5] diffcore-rename.c: use new hash map implementation

2013-09-10 Thread Karsten Blees
Signed-off-by: Karsten Blees bl...@dcon.de --- diffcore-rename.c | 48 +--- 1 file changed, 13 insertions(+), 35 deletions(-) diff --git a/diffcore-rename.c b/diffcore-rename.c index 82b7975..6271af9 100644 --- a/diffcore-rename.c +++

Hello

2013-09-10 Thread T. Stratford
Hello, You have won 1,000.000 great british pounds in the ongoing promo draw. For claims, contact Mr Jeremy via email on: jeremy-off...@qq.com Thanks, T. Stratford. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

Re: [PATCH-v3] Allow git-filter-branch to process large repositories with lots of branches.

2013-09-10 Thread Lee Carver
On 9/10/13 4:20 PM, Junio C Hamano gits...@pobox.com wrote: Lee Carver lee.car...@servicenow.com writes: As noted in several forums, a recommended way to move trees between repositories is to use git-filter-branch to revise the history for a single tree:

Re: [PATCH 3/3] MSVC: fix stat definition hell

2013-09-10 Thread Eric Sunshine
On Tue, Sep 10, 2013 at 7:23 PM, Karsten Blees karsten.bl...@gmail.com wrote: In msvc.h, there's a couple of stat related functions defined diffently s/diffently/differently/ from mingw.h. When we remove these definitions, the only problem we get is warning C4005: '_stati64' : macro

Re: push.default=upstream doesn't play nicely with remote.pushdefault/branch.*.pushremote

2013-09-10 Thread Felipe Contreras
On Tue, Sep 10, 2013 at 8:10 AM, Ximin Luo infini...@gmx.com wrote: (Please CC me as I am not subscribed.) No need to say that, Git mailing list is sane and doesn't do reply-to munging. The question here then is, what remote branch should git push to - since pushremote only specifies a repo?

Re: [PATCH] http-backend: provide Allow header for 405

2013-09-10 Thread brian m. carlson
On Sun, Sep 08, 2013 at 09:18:12PM -0700, Jonathan Nieder wrote: --- a/http-backend.c +++ b/http-backend.c @@ -594,8 +594,11 @@ int main(int argc, char **argv) if (strcmp(method, c-method)) { const char *proto = getenv(SERVER_PROTOCOL);

[PATCH] Documentation/git-checkout: Move `--detach` flag in synopsis to correct command

2013-09-10 Thread Benjamin Bergman
From a33659535cb0eac92bed42d5e494dbb8f5d9ab20 Mon Sep 17 00:00:00 2001 From: Benjamin Bergman b...@benbergman.ca Date: Tue, 10 Sep 2013 16:00:29 -0500 Subject: [PATCH] Documentation/git-checkout: Move `--detach` flag in synopsis to correct command Detailed description of `--detach` states that

Re: Regression in e02ca72: git svn rebase is broken on Windows

2013-09-10 Thread Jiang Xin
2013/9/11 Junio C Hamano gits...@pobox.com: Tvangeste i.4m.l...@yandex.ru writes: Hi, After bisecting this problem I ended up with the mentioned commit that completely breaks git-svn for me on Windows (mingw/msys version). == # git svn rebase warning: unable to access '':

Re: Regression in e02ca72: git svn rebase is broken on Windows

2013-09-10 Thread Jiang Xin
2013/9/11 Karsten Blees karsten.bl...@gmail.com: Junio C Hamano gitster at pobox.com writes: The suspect commit and symptom look consistent. You started from a directory whose absolute path is w:/work/... and the updated code mistakenly thoguht that something that begins with w (not '/') is

Re: Regression in e02ca72: git svn rebase is broken on Windows

2013-09-10 Thread Johannes Sixt
Am 11.09.2013 05:19, schrieb Jiang Xin: I tested 'relative_path' function using 'test-path-utils', and got the following result: $ ./test-path-utils relative_path 'C:/a/b' 'D:/x/y' ../../../C:/a/b $ ./test-path-utils relative_path '/a/b' 'x/y' ../..//a/b $