Re: Pack bitmaps on Git for Windows

2014-04-23 Thread Jeff King
On Tue, Apr 22, 2014 at 05:58:10PM +1000, Bryan Turner wrote: It looks like the documentation for bitmaps is being included in the 1.9.2 release of Git for Windows but the functionality itself is not present. For example, doc\git\html\git-config.html includes settings like these:

Re: error: git-remote-https died of signal 13

2014-04-23 Thread Jeff King
On Sun, Apr 20, 2014 at 08:42:15PM -0400, Greg M wrote: Using git version 1.9.2 I am getting this error: [normal@laptop tmp]$ git clone https://github.com/mozilla/rust.git Cloning into 'rust'... remote: Reusing existing pack: 296648, done. remote: Counting objects: 80, done. remote:

Re: [ANNOUNCE] Git v2.0.0-rc0

2014-04-23 Thread Johan Herland
On Wed, Apr 23, 2014 at 12:47 AM, Junio C Hamano gits...@pobox.com wrote: brian m. carlson sand...@crustytoothpaste.net writes: What we could do instead is simply require a newer version of Getopt::Long, which would let people continue using their ancient OSes and install a newer version from

Re: [RTC/PATCH] Add 'update-branch' hook

2014-04-23 Thread Stephen Leake
Felipe Contreras felipe.contre...@gmail.com writes: Stephen Leake wrote: Felipe Contreras felipe.contre...@gmail.com writes: Ilya Bobyr wrote: On 4/21/2014 2:17 PM, Felipe Contreras wrote: Ilya Bobyr wrote: Also, most have names that start with either pre- or post-. It seems

[PATCH v2] git tag --contains : avoid stack overflow

2014-04-23 Thread Stepan Kasal
From: Jean-Jacques Lafay jeanjacques.la...@gmail.com In large repos, the recursion implementation of contains(commit, commit_list) may result in a stack overflow. Replace the recursion with a loop to fix it. This problem is more apparent on Windows than on Linux, where the stack is more limited

Re: [PATCH 2/2] mergetool: run prompt only if guessed tool

2014-04-23 Thread Charles Bailey
On Tue, Apr 22, 2014 at 02:56:22AM -0500, Felipe Contreras wrote: An explicitly set mergetool.prompt = true would override the default. See the patch. I have had a chance to test the patch now and it looks good. I think when glancing at it before I missed the change that dropped || echo true

Re: [PATCH 2/2] mergetool: run prompt only if guessed tool

2014-04-23 Thread David Aguilar
On Tue, Apr 22, 2014 at 10:19 AM, Junio C Hamano gits...@pobox.com wrote: David Aguilar dav...@gmail.com writes: [Cc:ing Charles in case he has an opinion, this behavior dates back to the original MT] On Sun, Apr 20, 2014 at 07:17:34PM -0500, Felipe Contreras wrote: It's annoying to see

Re: [RTC/PATCH] Add 'update-branch' hook

2014-04-23 Thread Felipe Contreras
Stephen Leake wrote: Felipe Contreras felipe.contre...@gmail.com writes: Stephen Leake wrote: Felipe Contreras felipe.contre...@gmail.com writes: Ilya Bobyr wrote: On 4/21/2014 2:17 PM, Felipe Contreras wrote: Ilya Bobyr wrote: Also, most have names that start with

Re: [PATCH v3] send-email: recognize absolute path on Windows

2014-04-23 Thread Erik Faye-Lund
On Tue, Apr 22, 2014 at 6:50 PM, Junio C Hamano gits...@pobox.com wrote: Erik Faye-Lund kusmab...@gmail.com writes: Shouldn't the latter also be anchored at the beginning of the string with a leading ^? +} + +require File::Spec::Functions; +return

Re: [PATCH] git-rebase: fix probable reflog typo

2014-04-23 Thread Matthieu Moy
Felipe Contreras felipe.contre...@gmail.com writes: Commit 26cd160 (rebase -i: use a better reflog message) tried to produce a better reflog message, however, it seems a statement was introduced by mistake. 'comment_for_reflog start' basically overides the GIT_REFLOG_ACTION we just set. I

Re: error: git-remote-https died of signal 13

2014-04-23 Thread Greg M
On Wed, Apr 23, 2014 at 2:59 AM, Jeff King p...@peff.net wrote: On Sun, Apr 20, 2014 at 08:42:15PM -0400, Greg M wrote: Using git version 1.9.2 I am getting this error: [normal@laptop tmp]$ git clone https://github.com/mozilla/rust.git Cloning into 'rust'... remote: Reusing existing pack:

[PATCH v4 1/6] diff: add a config option to control orderfile

2014-04-23 Thread Michael S. Tsirkin
I always want my diffs to show header files first, then .c files, then the rest. Make it possible to set orderfile though a config option to achieve this. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- diff.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/diff.c b/diff.c index

[PATCH v4 4/6] patch-id: make it stable against hunk reordering

2014-04-23 Thread Michael S. Tsirkin
Patch id changes if users 1. reorder file diffs that make up a patch or 2. split a patch up to multiple diffs that touch the same path (keeping hunks within a single diff ordered to make patch valid). As the result is functionally equivalent, a different patch id is surprising to many users. In

[PATCH v4 5/6] patch-id: document new behaviour

2014-04-23 Thread Michael S. Tsirkin
Clarify that patch ID can now be a sum of hashes, not a hash. Document how command line and config options affect the behaviour. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- Documentation/git-patch-id.txt | 25 - 1 file changed, 20 insertions(+), 5 deletions(-)

[PATCH v4 6/6] patch-id-test: test stable and unstable behaviour

2014-04-23 Thread Michael S. Tsirkin
Verify that patch ID supports an algorithm that is stable against diff split and reordering. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- t/t4204-patch-id.sh | 140 +++- 1 file changed, 129 insertions(+), 11 deletions(-) diff --git

[PATCH v4 3/6] tests: new test for orderfile options

2014-04-23 Thread Michael S. Tsirkin
The test is very basic and can be extended. Couldn't find a good existing place to put it, so created a new file. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- t/t4056-diff-order.sh | 63 +++ 1 file changed, 63 insertions(+) create mode

[PATCH v4 2/6] test: add test_write_lines helper

2014-04-23 Thread Michael S. Tsirkin
As suggested by Junio. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- t/test-lib-functions.sh | 7 +++ 1 file changed, 7 insertions(+) diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index aeae3ca..2fa6453 100644 --- a/t/test-lib-functions.sh +++

Re: [PATCH v2 2/3] remote-helpers: move out of contrib

2014-04-23 Thread Max Horn
On 21.04.2014, at 22:37, Felipe Contreras felipe.contre...@gmail.com wrote: The remote-helpers in contrib/remote-helpers have proved to work, be reliable, and stable. It's time to move them out of contrib, and be distributed by default. Really? While I agree that git-remote-hg by now works

[PATCH 05/14] txt-to-pot.sh: use the $( ... ) construct for command substitution

2014-04-23 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

[PATCH 10/14] git-web--browse.sh: use the $( ... ) construct for command substitution

2014-04-23 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

[PATCH 01/14] t9365-continuing-queries.sh: use the $( ... ) construct for command substitution

2014-04-23 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

[PATCH 14/14] p5302-pack-index.sh: use the $( ... ) construct for command substitution

2014-04-23 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

[PATCH 13/14] lib-gpg.sh: use the $( ... ) construct for command substitution

2014-04-23 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

[PATCH 06/14] git-pull.sh: use the $( ... ) construct for command substitution

2014-04-23 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

[PATCH 09/14] git-stash.sh: use the $( ... ) construct for command substitution

2014-04-23 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

[PATCH 08/14] git-rebase.sh: use the $( ... ) construct for command substitution

2014-04-23 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

[PATCH 11/14] lib-credential.sh: use the $( ... ) construct for command substitution

2014-04-23 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

[PATCH 12/14] lib-cvs.sh: use the $( ... ) construct for command substitution

2014-04-23 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

[PATCH 07/14] git-rebase--merge.sh: use the $( ... ) construct for command substitution

2014-04-23 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

[PATCH 02/14] test-gitmw-lib.sh: use the $( ... ) construct for command substitution

2014-04-23 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

[PATCH 03/14] t7900-subtree.sh: use the $( ... ) construct for command substitution

2014-04-23 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

[PATCH 04/14] appp.sh: use the $( ... ) construct for command substitution

2014-04-23 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

Re: [PATCH v2] git tag --contains : avoid stack overflow

2014-04-23 Thread Johannes Schindelin
Hi, On Wed, 23 Apr 2014, Stepan Kasal wrote: I have found out that ulimit -s does not work on Windows. Adding this as a prerequisite, we will skip the test there. The interdiff can be seen here: https://github.com/msysgit/git/commit/c68e27d5 Ciao, Johannes -- To unsubscribe from

[PATCH 1/2] git-remote-mediawiki: allow stop/start-ing the test server

2014-04-23 Thread Matthieu Moy
Previously, the user had to launch a complete re-install after a lighttpd stop (e.g. a reboot). Signed-off-by: Matthieu Moy matthieu@imag.fr --- contrib/mw-to-git/t/install-wiki.sh | 10 ++ contrib/mw-to-git/t/test-gitmw-lib.sh | 2 +- 2 files changed, 11 insertions(+), 1

Re: [PATCH 05/14] txt-to-pot.sh: use the $( ... ) construct for command substitution

2014-04-23 Thread Matthieu Moy
Elia Pinto gitter.spi...@gmail.com writes: git-gui/po/glossary/txt-to-pot.sh |4 ++-- git-gui is a separate project, patches are normally applied to git-gui first, and then pulled by Junio. I'd suggest dropping this patch, it's probably not worth the trouble (although the patch is

Re: [PATCH 01/14] t9365-continuing-queries.sh: use the $( ... ) construct for command substitution

2014-04-23 Thread Matthieu Moy
Patches 01 to 14/14 are Reviewed-by: Matthieu Moy matthieu@imag.fr -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- 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

[PATCH 2/2] git-remote-mediawiki: fix encoding issue for UTF-8 media files

2014-04-23 Thread Matthieu Moy
When a media file contains valid UTF-8, git-remote-mediawiki tried to be too clever about the encoding, and the call to utf8::downgrade() on the downloaded content was failing with Wide character in subroutine entry at git-remote-mediawiki line 583. Instead, use $response-decode() to apply

Re: [PATCH v2] git tag --contains : avoid stack overflow

2014-04-23 Thread Stepan Kasal
Hello, On Wed, Apr 23, 2014 at 04:28:39PM +0200, Johannes Schindelin wrote: The interdiff can be seen here: https://github.com/msysgit/git/commit/c68e27d5 not exatly, is also changes the number of commits in the deep repo from 1000 to 4000, as peff proposed. Stepan -- To unsubscribe

Re: How to trim the fat on my log graphs

2014-04-23 Thread Robert Dailey
Thanks, removing those two options did help quite a bit already. However, the history can still get pretty crazy. Is there a way to hide all tags from the log graph? Really I just want the LABELS to be hidden. On Tue, Apr 22, 2014 at 4:37 PM, Junio C Hamano gits...@pobox.com wrote: Robert Dailey

Re: [ANNOUNCE] Git v2.0.0-rc0

2014-04-23 Thread Junio C Hamano
Johan Herland jo...@herland.net writes: I.e. use Kyle's patch to t9117, plus something like this: diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 5b3c38d..9f579e0 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -91,6 +91,9 @@ COMMANDS

Re: [PATCH 2/2] mergetool: run prompt only if guessed tool

2014-04-23 Thread Junio C Hamano
David Aguilar dav...@gmail.com writes: On Tue, Apr 22, 2014 at 10:19 AM, Junio C Hamano gits...@pobox.com wrote: ... Thanks for CC'ing Charles, by the way. I think his point about mentioning the change of default somewhere in the documentation has some merits, and it can be done in a

Re: [PATCH 2/2] mergetool: run prompt only if guessed tool

2014-04-23 Thread Junio C Hamano
Charles Bailey char...@hashpling.org writes: The bit of documentation that I was thinking of is in Documentation/git-mergetool.txt where it states that --prompt is the default which is now only partially true. Thanks for being careful to help tying the loose ends. Perhaps like this? I take

Archiving off old branches

2014-04-23 Thread Tim Chase
I've got a branch for each bug/issue and it was getting a bit unwieldy. A little searching suggested this # archive off the BUG-123 branch git update-ref refs/closed/BUG-123 BUG-123 git branch -D BUG-123 which seems to do exactly what I want -- branches are archived off so they still have

Re: How to trim the fat on my log graphs

2014-04-23 Thread Junio C Hamano
Robert Dailey rcdailey.li...@gmail.com writes: [Administrivia: because people read from top to bottom / why is it bad to top-post? / please do not top-post.] On Tue, Apr 22, 2014 at 4:37 PM, Junio C Hamano gits...@pobox.com wrote: Robert Dailey rcdailey.li...@gmail.com writes: git log log

Re: [PATCH v4 2/6] test: add test_write_lines helper

2014-04-23 Thread Junio C Hamano
Michael S. Tsirkin m...@redhat.com writes: As suggested by Junio. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- Ehh, I would probably not suggest such an implementation though. test_write_lines () { printf %s\n $@ } might be, but not with echo and

Re: [PATCH v4 4/6] patch-id: make it stable against hunk reordering

2014-04-23 Thread Junio C Hamano
Are these three patches the same as what has been queued on mt/patch-id-stable topic and cooking in 'next' for a few weeks? -- 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: [PATCH v4 3/6] tests: new test for orderfile options

2014-04-23 Thread Junio C Hamano
Michael S. Tsirkin m...@redhat.com writes: The test is very basic and can be extended. Couldn't find a good existing place to put it, so created a new file. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- t/t4056-diff-order.sh | 63

Re: Archiving off old branches

2014-04-23 Thread Junio C Hamano
Tim Chase g...@tim.thechases.com writes: Reading up on git help update-ref, it states that it updates the name safely. I think that description is well intended but is misleading. There are many potential sources of risk, and the safely refers to protection against a particular kind of risk:

Re: [PATCH v4 4/6] patch-id: make it stable against hunk reordering

2014-04-23 Thread Michael S. Tsirkin
On Wed, Apr 23, 2014 at 10:39:23AM -0700, Junio C Hamano wrote: Are these three patches the same as what has been queued on mt/patch-id-stable topic and cooking in 'next' for a few weeks? Not exactly - at your request I implemented git config options to control patch id behaviour. Documentation

Re: [PATCH v4 2/6] test: add test_write_lines helper

2014-04-23 Thread Michael S. Tsirkin
On Wed, Apr 23, 2014 at 10:34:30AM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: As suggested by Junio. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- Ehh, I would probably not suggest such an implementation though. test_write_lines () {

Re: Archiving off old branches

2014-04-23 Thread Jonathan Nieder
Hi, Tim Chase wrote: cd .git/refs mkdir -p closed mv heads/BUG-123 closed That breaks with packed refs (see git-pack-refs(1)), which are a normal thing to encounter after garbage collection. Hope that helps, Jonathan -- To unsubscribe from this list: send the line unsubscribe git in

Re: [PATCH v4 3/6] tests: new test for orderfile options

2014-04-23 Thread Michael S. Tsirkin
On Wed, Apr 23, 2014 at 10:38:07AM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: The test is very basic and can be extended. Couldn't find a good existing place to put it, so created a new file. Signed-off-by: Michael S. Tsirkin m...@redhat.com ---

Re: Archiving off old branches

2014-04-23 Thread Tim Chase
On 2014-04-23 10:58, Jonathan Nieder wrote: Tim Chase wrote: cd .git/refs mkdir -p closed mv heads/BUG-123 closed That breaks with packed refs (see git-pack-refs(1)), which are a normal thing to encounter after garbage collection. Hope that helps, Very much so.

Re: Archiving off old branches

2014-04-23 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Tim Chase wrote: cd .git/refs mkdir -p closed mv heads/BUG-123 closed That breaks with packed refs (see git-pack-refs(1)), which are a normal thing to encounter after garbage collection. Specifically, - if BUG-123 branch was placed in

Re: [PATCH 1/3] test-lib: Document short options in t/README

2014-04-23 Thread Junio C Hamano
Ilya Bobyr ilya.bo...@gmail.com writes: Most arguments that could be provided to a test have short forms. Unless documented, the only way to learn them is to read the code. Signed-off-by: Ilya Bobyr ilya.bo...@gmail.com --- t/README |8 1 files changed, 4 insertions(+), 4

Re: [PATCH 3/3] test-lib: '--run' to run only specific tests

2014-04-23 Thread Junio C Hamano
Ilya Bobyr ilya.bo...@gmail.com writes: @@ -187,10 +192,70 @@ and either can match the t[0-9]{4} part to skip the whole test, or t[0-9]{4} followed by .$number to say which particular test to skip. -Note that some tests in the existing test suite rely on previous -test item, so you

Trying to setup Visual Studio 2013 with a CentOS 6.5 x64 git server

2014-04-23 Thread Charles Buege
All - If this is the wrong place to ask this question (I'm heading to Microsoft's site next), then I apologize, but communities like this have always been kind to me in the past, so I thought I'd start here. I'm looking to setup a git server under CentOS 6.5 x64 that will serve 2-5 .NET

Re: [PATCH v2] git tag --contains : avoid stack overflow

2014-04-23 Thread Junio C Hamano
Stepan Kasal ka...@ucw.cz writes: [Administrivia: please refrain from using Mail-Followup-To to deflect an attempt to directly respond to you; it will waste time of other people while it may be saving your time]. From: Jean-Jacques Lafay jeanjacques.la...@gmail.com In large repos, the

Re: [PATCH v2] git tag --contains : avoid stack overflow

2014-04-23 Thread Jeff King
On Wed, Apr 23, 2014 at 12:12:14PM -0700, Junio C Hamano wrote: +ulimit_stack=ulimit -s 64 +test_lazy_prereq ULIMIT 'bash -c '$ulimit_stack'' With this implementaion, ULIMIT implies bash, and we use bash that appears on user's PATH that may not be the one the user chose to run git with.

Re: [PATCH v2] git tag --contains : avoid stack overflow

2014-04-23 Thread Jeff King
On Wed, Apr 23, 2014 at 09:53:25AM +0200, Stepan Kasal wrote: I have found out that ulimit -s does not work on Windows. Adding this as a prerequisite, we will skip the test there. I found this bit weird, as the test originated on Windows. Did it never actually cause a failure there (i.e., the

Re: Trying to setup Visual Studio 2013 with a CentOS 6.5 x64 git server

2014-04-23 Thread Jonathan Nieder
Hi, Charles Buege wrote: If, in actuality, I can use a CentOS git server with Visual Studio 2013, can anyone point me in the direction of an FAQ/directions/YouTube video/book/anything for how to setup something like this? I suspect

Re: [PATCH v2 2/3] remote-helpers: move out of contrib

2014-04-23 Thread Junio C Hamano
Max Horn m...@quendi.de writes: That said, I don't know what the criteria are for moving something out of contrib. Because we accept stuff to contrib/, with an assumption that it is to stay there without contaminating the main part of the system, the quality of stuff in contrib/ can be sub-par

Re: Fwd: git p4: feature request - branch check filtering

2014-04-23 Thread Pete Wyckoff
dpr...@gmail.com wrote on Tue, 22 Apr 2014 10:29 +0100: There is a patch viewable at this link: https://github.com/Stealthii/git/commit/f7a2e611262fd977ac99e066872d3d0743b7df3c For the use case this works perfectly - if I define branch mappings with git config, followed by setting

Re: [PATCH 3/3] test-lib: '--run' to run only specific tests

2014-04-23 Thread Eric Sunshine
On Tue, Apr 22, 2014 at 4:19 AM, Ilya Bobyr ilya.bo...@gmail.com wrote: Allow better control of the set of tests that will be executed for a single test suite. Mostly useful while debugging or developing as it allows to focus on a specific test. Signed-off-by: Ilya Bobyr ilya.bo...@gmail.com

[RFC/PATCH v2 0/3] New 'update-branch' hook

2014-04-23 Thread Felipe Contreras
Currently it's not possible to keep track of changes that happen to a branch, specifically; when a branch is created and rebased. This patch series aims to fix that. The last patch is the important one, but in the process of testing this I found out that the GIT_DIR environment variable is not

[RFC/PATCH v2 1/3] sh-setup: export GIT_DIR

2014-04-23 Thread Felipe Contreras
It is what the clients of this library expect. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- git-sh-setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/git-sh-setup.sh b/git-sh-setup.sh index 5f28b32..fb0362f 100644 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -346,6

[RFC/PATCH v2 2/3] run-command: make sure hooks have always GIT_DIR

2014-04-23 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- run-command.c | 24 ++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/run-command.c b/run-command.c index 75abc47..8e188f6 100644 --- a/run-command.c +++ b/run-command.c @@ -765,12 +765,29 @@ int

[RFC/PATCH v2 3/3] Add 'update-branch' hook

2014-04-23 Thread Felipe Contreras
This hook is invoked before a branch is updated, either when a branch is created or updated with 'git branch', or when it's rebased with 'git rebase'. It receives three parameters; the name of the branch, the SHA-1 of the latest commit, and the SHA-1 of the first commit of the branch. When a

Re: Trying to setup Visual Studio 2013 with a CentOS 6.5 x64 git server

2014-04-23 Thread Storm-Olsen, Marius
On 4/23/2014 2:04 PM, Charles Buege wrote: If, in actuality, I can use a CentOS git server with Visual Studio 2013, can anyone point me in the direction of an FAQ/directions/ YouTube video/book/anything for how to setup something like this?

Re: How to trim the fat on my log graphs

2014-04-23 Thread Robert Dailey
On Wed, Apr 23, 2014 at 12:30 PM, Junio C Hamano gits...@pobox.com wrote: Robert Dailey rcdailey.li...@gmail.com writes: [Administrivia: because people read from top to bottom / why is it bad to top-post? / please do not top-post.] On Tue, Apr 22, 2014 at 4:37 PM, Junio C Hamano

Re: [PATCH v2] git tag --contains : avoid stack overflow

2014-04-23 Thread Stepan Kasal
Hi, On Wed, Apr 23, 2014 at 12:12:14PM -0700, Junio C Hamano wrote: [Administrivia: please refrain from using Mail-Followup-To to deflect an attempt to directly respond to you; thanks a lot for telling me. Actually, this was a mistake: I added git to the list of discussion lists, without

Re: [RFC/PATCH v2 1/3] sh-setup: export GIT_DIR

2014-04-23 Thread Jeff King
On Wed, Apr 23, 2014 at 02:42:38PM -0500, Felipe Contreras wrote: It is what the clients of this library expect. Is it? Passing GIT_DIR to sub-invocations of git will change how they determine the repo and working tree. Your patch seems to cause failures all over the test suite. Without

Re: [PATCH 1/3] fetch.c: clear errno before calling functions that might set it

2014-04-23 Thread Eric Sunshine
On Tue, Apr 22, 2014 at 2:45 PM, Ronnie Sahlberg sahlb...@google.com wrote: In s_update_ref there are two calls that when they fail we return an error based on the errno value. In particular we want to return a specific error if ENOTDIR happened. Both these functions do have failure modes where

Re: [PATCH 2/3] fetch.c: change s_update_ref to use a ref transaction

2014-04-23 Thread Eric Sunshine
On Tue, Apr 22, 2014 at 2:45 PM, Ronnie Sahlberg sahlb...@google.com wrote: Change s_update_ref to use a ref transaction for the ref update. Signed-off-by: Ronnie Sahlberg sahlb...@google.com Signed-off-by: Ronnie Sahlberg sahlb...@google.com Doubled sign-off. --- builtin/fetch.c | 15

Re: [PATCH v2 2/3] remote-helpers: move out of contrib

2014-04-23 Thread Junio C Hamano
Max Horn m...@quendi.de writes: [Administrivia: please wrap your lines to reasonable length like 70-75]. On 21.04.2014, at 22:37, Felipe Contreras felipe.contre...@gmail.com wrote: The remote-helpers in contrib/remote-helpers have proved to work, be reliable, and stable. It's time to move

Re: How to trim the fat on my log graphs

2014-04-23 Thread Junio C Hamano
Robert Dailey rcdailey.li...@gmail.com writes: On Wed, Apr 23, 2014 at 12:30 PM, Junio C Hamano gits...@pobox.com wrote: Robert Dailey rcdailey.li...@gmail.com writes: [Administrivia: because people read from top to bottom / why is it bad to top-post? / please do not top-post.] On Tue, Apr

Re: [RFC/PATCH v2 1/3] sh-setup: export GIT_DIR

2014-04-23 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Wed, Apr 23, 2014 at 02:42:38PM -0500, Felipe Contreras wrote: It is what the clients of this library expect. Is it? Passing GIT_DIR to sub-invocations of git will change how they determine the repo and working tree. Your patch seems to cause failures all

Re: [PATCH 3/3] fetch.c: use a single ref transaction for all ref updates

2014-04-23 Thread Eric Sunshine
On Tue, Apr 22, 2014 at 2:45 PM, Ronnie Sahlberg sahlb...@google.com wrote: Change store_updated_refs to use a single ref transaction for all refs that are updated during the fetch. This makes the fetch more atomic when update failures occur. Since ref update failures will now no longer occur

Re: [PATCH v5 1/2] add: add --ignore-submodules[=when] parameter

2014-04-23 Thread Eric Sunshine
On Tue, Apr 22, 2014 at 5:12 PM, Ronald Weiss weiss.ron...@gmail.com wrote: Allow ignoring submodules (or not) by command line switch, like diff and status do. This commit is also a prerequisite for the next one in series, which adds the --ignore-submodules switch to git commit. That's why a

Re: [RFC/PATCH v2 3/3] Add 'update-branch' hook

2014-04-23 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: This hook is invoked before a branch is updated, either when a branch is created or updated with 'git branch', or when it's rebased with 'git rebase'. It receives three parameters; the name of the branch, the SHA-1 of the latest commit, and

Re: [RFC/PATCH v2 2/3] run-command: make sure hooks have always GIT_DIR

2014-04-23 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Why is this a good change? From a zero-line log message, I cannot even tell if this is trying to fix some problem, or trying to give new capabilities to hooks. How does it prevent

Re: How to trim the fat on my log graphs

2014-04-23 Thread Jeff King
On Wed, Apr 23, 2014 at 02:59:26PM -0500, Robert Dailey wrote: I referred back to the documentation for --decorate: --decorate[=short|full|no] Print out the ref names of any commits that are shown. If short is specified, the ref name prefixesrefs/heads/, refs/tags/ and refs/remotes/ will

Re: [PATCH v2] git tag --contains : avoid stack overflow

2014-04-23 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Wed, Apr 23, 2014 at 12:12:14PM -0700, Junio C Hamano wrote: +ulimit_stack=ulimit -s 64 +test_lazy_prereq ULIMIT 'bash -c '$ulimit_stack'' With this implementaion, ULIMIT implies bash, and we use bash that appears on user's PATH that may not be the one

Re: [PATCH v2] git tag --contains : avoid stack overflow

2014-04-23 Thread Jeff King
On Wed, Apr 23, 2014 at 01:48:05PM -0700, Junio C Hamano wrote: I don't think so. The point is that we _must_ use bash here, not any POSIX shell. Sorry, but I do not understand. Isn't what you want any POSIX shell with 'ulimit -s 64' supported? Sure, that would be fine, but the original

Re: [PATCH v2 2/3] remote-helpers: move out of contrib

2014-04-23 Thread Felipe Contreras
Max Horn wrote: On 21.04.2014, at 22:37, Felipe Contreras felipe.contre...@gmail.com wrote: The remote-helpers in contrib/remote-helpers have proved to work, be reliable, and stable. It's time to move them out of contrib, and be distributed by default. Really? While I agree that

Re: [PATCH v2] git tag --contains : avoid stack overflow

2014-04-23 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Wed, Apr 23, 2014 at 01:48:05PM -0700, Junio C Hamano wrote: I don't think so. The point is that we _must_ use bash here, not any POSIX shell. Sorry, but I do not understand. Isn't what you want any POSIX shell with 'ulimit -s 64' supported? Sure,

Re: [PATCH v2 2/3] remote-helpers: move out of contrib

2014-04-23 Thread Felipe Contreras
Junio C Hamano wrote: Max Horn m...@quendi.de writes: Perhaps it is OK to move an undocumented remote-helper with known bugs out of contrib. We should strive to apply the same criteria as new submission to the main part of the system. And inputs from people like you who have more

Re: [PATCH v2] git tag --contains : avoid stack overflow

2014-04-23 Thread Johannes Schindelin
Hi Peff, On Wed, 23 Apr 2014, Jeff King wrote: On Wed, Apr 23, 2014 at 09:53:25AM +0200, Stepan Kasal wrote: I have found out that ulimit -s does not work on Windows. Adding this as a prerequisite, we will skip the test there. I found this bit weird, as the test originated on Windows.

Re: How to trim the fat on my log graphs

2014-04-23 Thread Felipe Contreras
Junio C Hamano wrote: Robert Dailey rcdailey.li...@gmail.com writes: [Administrivia: because people read from top to bottom / why is it bad to top-post? / please do not top-post.] https://en.wikipedia.org/wiki/Posting_style -- Felipe Contreras -- To unsubscribe from this list: send the

Re: [RFC/PATCH v2 3/3] Add 'update-branch' hook

2014-04-23 Thread Felipe Contreras
Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: This hook is invoked before a branch is updated, either when a branch is created or updated with 'git branch', or when it's rebased with 'git rebase'. It receives three parameters; the name of the branch, the

Re: [RFC/PATCH v2 3/3] Add 'update-branch' hook

2014-04-23 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: This hook is invoked before a branch is updated, either when a branch is created or updated with 'git branch', or when it's rebased with 'git rebase'. It

Re: [RFC/PATCH v2 2/3] run-command: make sure hooks have always GIT_DIR

2014-04-23 Thread Felipe Contreras
Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Why is this a good change? When a hook is called from a command without NEED_WORK_TREE, GIT_DIR is not set (e.g. git branch). How does it prevent existing

Re: [PATCH v2 2/3] remote-helpers: move out of contrib

2014-04-23 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: The very unlikely issue that nobody has reported about hg multiple heads and gc I just fixed, and the issue he just reported about 'foo' and 'foo/bar' is newly reported, and there's no easy way to fix this. I would not judge on

Re: [PATCH] git-rebase: fix probable reflog typo

2014-04-23 Thread Felipe Contreras
Matthieu Moy wrote: Felipe Contreras felipe.contre...@gmail.com writes: Commit 26cd160 (rebase -i: use a better reflog message) tried to produce a better reflog message, however, it seems a statement was introduced by mistake. 'comment_for_reflog start' basically overides the

Re: [RTC/PATCH] Add 'update-branch' hook

2014-04-23 Thread Felipe Contreras
Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: ... there are _already_ hooks without pre/post. Like commit-msg? Yes, it would have been nicer if it were named verify-commit-message or something. No it wouldn't. I can use the commit-msg hook to change the

Re: [RFC/PATCH v2 3/3] Add 'update-branch' hook

2014-04-23 Thread Felipe Contreras
Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: This hook is invoked before a branch is updated, either when a branch is created or updated with 'git branch', or when it's rebased

Re: [PATCH v4 4/6] patch-id: make it stable against hunk reordering

2014-04-23 Thread Junio C Hamano
Michael S. Tsirkin m...@redhat.com writes: On Wed, Apr 23, 2014 at 10:39:23AM -0700, Junio C Hamano wrote: Are these three patches the same as what has been queued on mt/patch-id-stable topic and cooking in 'next' for a few weeks? Not exactly - at your request I implemented git config

Re: [RTC/PATCH] Add 'update-branch' hook

2014-04-23 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: ... there are _already_ hooks without pre/post. Like commit-msg? Yes, it would have been nicer if it were named verify-commit-message or something. No it

Re: [PATCH v2 2/3] remote-helpers: move out of contrib

2014-04-23 Thread Max Horn
On 23.04.2014, at 22:54, Felipe Contreras felipe.contre...@gmail.com wrote: Max Horn wrote: On 21.04.2014, at 22:37, Felipe Contreras felipe.contre...@gmail.com wrote: The remote-helpers in contrib/remote-helpers have proved to work, be reliable, and stable. It's time to move them out of

Re: [RTC/PATCH] Add 'update-branch' hook

2014-04-23 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: I have a branch which should always be recompiled on update; post-update-branch would be a good place for that. And why would pre-update-branch not serve that purpose? Because the code that needs to be compiled is not yet in the

  1   2   >