Re: [msysGit] Re: [PATCH 13/14] git-compat-util.h: fix integer overflow on IL32P64 systems

2014-10-09 Thread Johannes Schindelin
Hi Junio, On Wed, 8 Oct 2014, Junio C Hamano wrote: Marat Radchenko ma...@slonopotamus.org writes: #define DEFAULT_PACKED_GIT_LIMIT \ - ((1024L * 1024L) * (sizeof(void*) = 8 ? 8192 : 256)) + ((size_t)(1024L * 1024L) * (sizeof(void*) = 8 ? 8192 : 256)) 1024 * 1024 * 8192

Re: [PATCH 13/14] git-compat-util.h: fix integer overflow on IL32P64 systems

2014-10-09 Thread Junio C Hamano
Marat Radchenko ma...@slonopotamus.org writes: On Wed, Oct 08, 2014 at 01:02:10PM -0700, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: Marat Radchenko ma...@slonopotamus.org writes: Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- git-compat-util.h | 2 +-

Re: [PATCH v3] completion: ignore chpwd_functions when cding on zsh

2014-10-09 Thread Øystein Walle
Brandon Turner bt at brandonturner.net writes: Software, such as RVM (ruby version manager), may set chpwd functions that result in an endless loop when cding. chpwd functions should be ignored. Now that it has moved to the zsh-specific script you can achieve this more simply by using cd

Re: [PATCH 14/14] MINGW: config.mak.uname: auto-detect MinGW build from compiler

2014-10-09 Thread Junio C Hamano
Marat Radchenko ma...@slonopotamus.org writes: On Wed, Oct 08, 2014 at 12:26:52PM -0700, Junio C Hamano wrote: ... What I am wondering is if it is a better solution to make it easier to allow somebody who is cross compiling to express Mr. Makefile, we know better than you and want you to do

Re: [msysGit] Re: [PATCH 14/14] MINGW: config.mak.uname: auto-detect MinGW build from compiler

2014-10-09 Thread Johannes Schindelin
Hi Junio, On Thu, 9 Oct 2014, Junio C Hamano wrote: Marat Radchenko ma...@slonopotamus.org writes: On Wed, Oct 08, 2014 at 12:26:52PM -0700, Junio C Hamano wrote: ... What I am wondering is if it is a better solution to make it easier to allow somebody who is cross compiling to

PATCH] mingw: Fix a typo in the pipe() implementation.

2014-10-09 Thread Ralph Loader
We checked the first file descriptor for errors twice, instead of checking both file descriptors. Signed-off-by: Ralph Loader r...@ihug.co.nz --- While this appears utterly trivial, I noticed this reading the code not running it - I do not have the relevant OS to compile and test on.

Re: [PATCH 14/14] MINGW: config.mak.uname: auto-detect MinGW build from compiler

2014-10-09 Thread Marat Radchenko
On Thu, Oct 09, 2014 at 12:34:25AM -0700, Junio C Hamano wrote: No, and I do not quite see why you even need to look at -dumbmachine output when your goal is to make this command line $ make uname_O=MINGW uname_S=MINGW work sensibly. Wouldn't it be more like a series of

Re: [msysGit] [PATCH v5] MinGW(-W64) compilation

2014-10-09 Thread Johannes Schindelin
Hi all, On Wed, 8 Oct 2014, Marat Radchenko wrote: This patch series fixes building on modern MinGW and MinGW-W64 (including x86_64). To make it more convenient to work on this patch series using Git, I pushed this branch to

Re: [msysGit] Re: [PATCH 14/14] MINGW: config.mak.uname: auto-detect MinGW build from compiler

2014-10-09 Thread Johannes Schindelin
Hi Junio, On Thu, 9 Oct 2014, Junio C Hamano wrote: Isn't the primary reason we use colon-assign to avoid running the same $(shell) over and over again every time $(uname_?) gets referenced? How would it work with ?= ??? I was under the impression that ?= would only define the variable once,

Re: [PATCH] git-prompt.sh: Omit prompt for ignored directories

2014-10-09 Thread Jess Austin
On Thu, Oct 9, 2014 at 12:37 AM, Richard Hansen rhan...@bbn.com wrote: On 2014-10-08 17:37, Jess Austin wrote: On Wed, Oct 8, 2014 at 4:12 PM, Richard Hansen rhan...@bbn.com wrote: On 2014-10-08 15:04, Jess Austin wrote: Introduce a new environmental variable, GIT_PS1_OMITIGNORED, which tells

Re: [msysGit] [PATCH v5] MinGW(-W64) compilation

2014-10-09 Thread Marat Radchenko
On Thu, Oct 09, 2014 at 12:11:01PM +0200, Johannes Schindelin wrote: I also added one patch I find highly convenient: https://github.com/dscho/git/commit/29749c7d7b4638c63369d6cf067f5d524d0092f9 There already were two attempts to this issue: 1.

Fwd: cannot checkout svn repository

2014-10-09 Thread Adrian Stern
Hi I'm unable to checkout this subversion repository with git. Can somebody help me? svn co http://svn.apache.org/repos/asf/ofbiz/branches/release13.07 ofbiz.13.07 Yes i can clone it with SVN and add it to git. But this disturbes the workflow and causes problems when someone commits to this

Re: cannot checkout svn repository

2014-10-09 Thread Adrian Stern
Well. after about 15 to 30 minutes it began to download the repository finishing with error: bad file descriptor on git-svn. It checked r1 to r50+ with took some time. The unit-tests where successful so i think the broken pipe was not an issue in the end. Sorry for disturbing you.

Re: [msysGit] Re: [PATCH 14/14] MINGW: config.mak.uname: auto-detect MinGW build from compiler

2014-10-09 Thread Johannes Schindelin
Hi Junio, On Thu, 9 Oct 2014, Junio C Hamano wrote: I didn't mean multiple uses of ?= for the same variable. I meant multiple uses of (references to) the variable. I.e. wouldn't FOO and BAR behave differently below? FOO := $(shell random) BAR = $(shell random) all:: echo $(FOO) and

Please reply

2014-10-09 Thread Jose Calvache
Dear Sir/Madam, Here is a pdf attachment of my proposal to you. Please read and reply I would be grateful. Jose Calvache -- 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

Some PRETTY FORMATS format:string options don't work with git-archive export-subst $Format:$

2014-10-09 Thread Derek Moore
I first noticed this using the system git provided in Fedora 21, so I cloned the official git repo, built from source, and it would appear there are even more options that don't work with export-subst in the latest code. I tested this under commit 63a45136a329bab550425c3142db6071434d935e (HEAD,

git-archive doesn't support --date= option for %ad %cd format:string's

2014-10-09 Thread Derek Moore
PRETTY FORMATS' format:string documentation says, %ad: author date (format respects --date= option), and similarly for %cd. But git-archive does not support the --date= option for changing the date format in $Format:%ad$ or $Format:%cd$ substitution strings. Relatedly, I want a short RFC date,

Re: Some PRETTY FORMATS format:string options don't work with git-archive export-subst $Format:$

2014-10-09 Thread Derek Moore
On Thu, Oct 9, 2014 at 10:56 AM, Derek Moore derek.p.mo...@gmail.com wrote: I first noticed this using the system git provided in Fedora 21, so I cloned the official git repo, built from source, and it would appear there are even more options that don't work with export-subst in the latest

DOCBOOK2X_TEXI in Documentation/Makefile invalid on some distributions

2014-10-09 Thread Derek Moore
Following the INSTALL doc, I was building git with: make prefix=/usr/local all doc info Even after installing docbook2X, I couldn't get past the first DB2TEXI build step until I discovered that 'docbook2x-texi' is named 'db2x_docbook2texi' in Fedora 21 using the latest upstream docbook2X 0.8.8.

Re: Can I fetch an arbitrary commit by sha1?

2014-10-09 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Tue, Oct 07, 2014 at 09:52:33AM -0700, Junio C Hamano wrote: Duy Nguyen pclo...@gmail.com writes: Hmm.. Junio already did most of the work in 051e400 (helping smart-http/stateless-rpc fetch race - 2011-08-05), so all we need to do is enable

Re: [PATCH v3] completion: ignore chpwd_functions when cding on zsh

2014-10-09 Thread Junio C Hamano
Øystein Walle oys...@gmail.com writes: Brandon Turner bt at brandonturner.net writes: Software, such as RVM (ruby version manager), may set chpwd functions that result in an endless loop when cding. chpwd functions should be ignored. Now that it has moved to the zsh-specific script you

Re: [PATCH] mergetool: use more conservative temporary filenames

2014-10-09 Thread Junio C Hamano
David Aguilar dav...@gmail.com writes: Avoid filenames with multiple dots so that overly-picky tools do not misinterpret their extension. Previously, foo/bar.ext in the worktree would result in e.g. foo/bar.ext.BASE.1234.ext This can be improved by having only a single .ext and

[PATCH v1] rebase -m: Use empty tree base for parentless commits

2014-10-09 Thread Fabian Ruch
When the user specifies a merge strategy, `git-merge-$strategy` is used in non-interactive mode to replay the changes introduced by the current branch relative to some upstream. Specifically, for each commit `c` that is not in upstream the changes that led from `c^` to `c` are reapplied. If the

[PATCH v4] completion: ignore chpwd_functions when cding on zsh

2014-10-09 Thread Brandon Turner
Software, such as RVM (ruby version manager), may set chpwd functions that result in an endless loop when cding. chpwd functions should be ignored. As I've only seen this so far on ZSH, I'm applying this change only to the git-completion.zsh overrides. Signed-off-by: Brandon Turner

Re: [PATCH v1] rebase -m: Use empty tree base for parentless commits

2014-10-09 Thread Junio C Hamano
Fabian Ruch baf...@gmail.com writes: diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh index d3fb67d..3f754ae 100644 --- a/git-rebase--merge.sh +++ b/git-rebase--merge.sh @@ -67,7 +67,13 @@ call_merge () { GIT_MERGE_VERBOSITY=1 export GIT_MERGE_VERBOSITY fi

Re: [PATCH v1] rebase -m: Use empty tree base for parentless commits

2014-10-09 Thread Derek Moore
Should perhaps you be using some symbolic method of referencing the empty tree instead of referencing a magic number? E.g., https://git.wiki.kernel.org/index.php/Aliases#Obtaining_the_Empty_Tree_SHA1 On Thu, Oct 9, 2014 at 1:50 PM, Fabian Ruch baf...@gmail.com wrote: When the user specifies a

Re: Some PRETTY FORMATS format:string options don't work with git-archive export-subst $Format:$

2014-10-09 Thread Jeff King
On Thu, Oct 09, 2014 at 12:42:39PM -0500, Derek Moore wrote: As far as I've tested it would seem only %N doesn't resolve inside of $Format:$, until I maybe do unit tests for this to identify any others. Yes, %N is somewhat special in that the calling code needs to initialize the notes tree

Re: Some PRETTY FORMATS format:string options don't work with git-archive export-subst $Format:$

2014-10-09 Thread Derek Moore
Thanks, Jeff, I may look into cleaning up your patch to propose a proper solution to this list, as time allows. Incidentally, I did stumble across: http://git.kernel.org/cgit/git/git.git/commit/?id=5b16360330822527eac1fa84131d185ff784c9fb which also references you, but I forgot to mention it.

Re: [PATCH v1] rebase -m: Use empty tree base for parentless commits

2014-10-09 Thread David M. Lloyd
On 10/09/2014 01:50 PM, Fabian Ruch wrote: Hi David, I don't think you made a mistake at all. If I understand the --merge mode of git-rebase correctly there is no need to require a parent. The error occurs when the script tries to determine the changes your merge commit introduces, which

Re: [msysGit] [PATCH 07/14] Fix BASIC_LDFLAGS and COMPAT_CFLAGS for 64bit MinGW-w64

2014-10-09 Thread Johannes Schindelin
Hi, On Wed, 8 Oct 2014, Marat Radchenko wrote: +CC_MACH := $(shell sh -c '$(CC) -dumpmachine 2/dev/null || echo not') There is a rather huge problem with that. The latest mingw-w64 release, 4.9.1, does not do what you expect here: while '.../mingw32/bin/gcc -m32 -o 32.exe test.c' and

Re: [PATCH v3] completion: ignore chpwd_functions when cding on zsh

2014-10-09 Thread Øystein Walle
Junio C Hamano gitster at pobox.com writes: Øystein Walle oystwa at gmail.com writes: Brandon Turner bt at brandonturner.net writes: Software, such as RVM (ruby version manager), may set chpwd functions that result in an endless loop when cding. chpwd functions should be

Re: git-archive doesn't support --date= option for %ad %cd format:string's

2014-10-09 Thread Jeff King
On Thu, Oct 09, 2014 at 11:19:36AM -0500, Derek Moore wrote: PRETTY FORMATS' format:string documentation says, %ad: author date (format respects --date= option), and similarly for %cd. But git-archive does not support the --date= option for changing the date format in $Format:%ad$ or

Re: [msysGit] [PATCH 07/14] Fix BASIC_LDFLAGS and COMPAT_CFLAGS for 64bit MinGW-w64

2014-10-09 Thread Ray Donnelly
On Thu, Oct 9, 2014 at 8:22 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote: Hi, On Wed, 8 Oct 2014, Marat Radchenko wrote: +CC_MACH := $(shell sh -c '$(CC) -dumpmachine 2/dev/null || echo not') There is a rather huge problem with that. The latest mingw-w64 release, 4.9.1, does

Re: git-archive doesn't support --date= option for %ad %cd format:string's

2014-10-09 Thread Jeff King
On Thu, Oct 09, 2014 at 03:24:28PM -0400, Jeff King wrote: On Thu, Oct 09, 2014 at 11:19:36AM -0500, Derek Moore wrote: PRETTY FORMATS' format:string documentation says, %ad: author date (format respects --date= option), and similarly for %cd. But git-archive does not support the

Re: git-archive doesn't support --date= option for %ad %cd format:string's

2014-10-09 Thread Derek Moore
I don't see a big problem with that. But I wonder if we would do better to introduce arbitrary strftime-like formatting, so we do not have to keep adding new formats. My thoughts exactly... This list seems to be a prove-yourself-with-patches sorta place. If I can find the time, I'll try

Re: DOCBOOK2X_TEXI in Documentation/Makefile invalid on some distributions

2014-10-09 Thread Jeff King
On Thu, Oct 09, 2014 at 12:53:33PM -0500, Derek Moore wrote: Following the INSTALL doc, I was building git with: make prefix=/usr/local all doc info I wonder if it is actually sane to recommend building info for newcomers in INSTALL. I do not know if many of the list regulars do so (I

Re: DOCBOOK2X_TEXI in Documentation/Makefile invalid on some distributions

2014-10-09 Thread Derek Moore
:) Wasn't proposing a patch, that's for sure, was just evincing the change that worked for me. I agree INSTALL instructions should be fixed up and/or the DOCBOOK2X_TEXI should be conditionally assigned in a sane manner. I'd first want to inspect upstream docbook2X build process and Fedora

Re: [PATCH v4] completion: ignore chpwd_functions when cding on zsh

2014-10-09 Thread Øystein Walle
Brandon Turner bt at brandonturner.net writes: +__git_ls_files_helper () +{ + ( + test -n ${CDPATH+set} unset CDPATH + cd -q $1 + if [ $2 == --committable ]; then + git diff-index --name-only --relative HEAD + else

Re: [msysGit] [PATCH 07/14] Fix BASIC_LDFLAGS and COMPAT_CFLAGS for 64bit MinGW-w64

2014-10-09 Thread Johannes Schindelin
Hi Ray, On Thu, 9 Oct 2014, Ray Donnelly wrote: On Thu, Oct 9, 2014 at 8:22 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote: On Wed, 8 Oct 2014, Marat Radchenko wrote: +CC_MACH := $(shell sh -c '$(CC) -dumpmachine 2/dev/null || echo not') There is a rather huge problem

Re: [PATCH v1] rebase -m: Use empty tree base for parentless commits

2014-10-09 Thread Fabian Ruch
Hi Junio, On 10/09/2014 09:05 PM, Junio C Hamano wrote: Fabian Ruch baf...@gmail.com writes: diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh index d3fb67d..3f754ae 100644 --- a/git-rebase--merge.sh +++ b/git-rebase--merge.sh @@ -67,7 +67,13 @@ call_merge () {

Re: [PATCH v4] completion: ignore chpwd_functions when cding on zsh

2014-10-09 Thread Junio C Hamano
Øystein Walle oys...@gmail.com writes: BUT: Over a year ago Git learned the -C argument. Couldn't we use that here? That way we would not have to unset CDPATH and can get rid of the subshell and cd -q. If we allow the other functions to use several arguments to pass options with we can get

Re: [PATCH] use skip_prefix() to avoid more magic numbers

2014-10-09 Thread René Scharfe
Am 07.10.2014 um 20:23 schrieb Junio C Hamano: René Scharfe l@web.de writes: @@ -335,20 +337,18 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags, static struct { int kind; const char *prefix; -int pfxlen;

Re: [PATCH] use skip_prefix() to avoid more magic numbers

2014-10-09 Thread Junio C Hamano
René Scharfe l@web.de writes: I didn't think much about the performance implications. skip_prefix() doesn't call strlen(3), though. Ah, OK. The code handles millions of ref strings per second before and after the change, and with the change it's faster. I hope the results are

Re: [PATCH v1] rebase -m: Use empty tree base for parentless commits

2014-10-09 Thread Junio C Hamano
Fabian Ruch baf...@gmail.com writes: The interface to git-merge-$strategy is designed in such a way that each strategy should be capable of taking _no_ base at all. The merge strategies resolve and octopus seem to refuse to run if no base is specified. The former silently exits if no bases

Re: [PATCH v4] completion: ignore chpwd_functions when cding on zsh

2014-10-09 Thread Junio C Hamano
Brandon Turner b...@brandonturner.net writes: As Øystein pointed out, on zsh we can use cd -q to ignore chpwd_functions. Junio - from my testing, unsetting CDPATH is sufficient on zsh. Let's do this instead, though. Bugs are mine; as I do not use zsh myself, some testing is very much

What's cooking in git.git (Oct 2014, #01; Thu, 9)

2014-10-09 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. You can find the changes described here in the integration branches of the repositories listed at

Re: [PATCH v4] completion: ignore chpwd_functions when cding on zsh

2014-10-09 Thread Brandon Turner
On Thu, Oct 9, 2014 at 3:45 PM, Junio C Hamano gits...@pobox.com wrote: Bugs are mine; as I do not use zsh myself, some testing is very much appreciated. I've tested this patch in zsh and it fixes the original problem. I've also tested various scenarios in bash and zsh (CDPATH set, different

Re: [PATCH] git-prompt.sh: Omit prompt for ignored directories

2014-10-09 Thread Richard Hansen
On 2014-10-09 06:27, Jess Austin wrote: On Thu, Oct 9, 2014 at 12:37 AM, Richard Hansen rhan...@bbn.com wrote: On 2014-10-08 17:37, Jess Austin wrote: On Wed, Oct 8, 2014 at 4:12 PM, Richard Hansen rhan...@bbn.com wrote: On 2014-10-08 15:04, Jess Austin wrote: Introduce a new environmental

Re: [PATCH v4] completion: ignore chpwd_functions when cding on zsh

2014-10-09 Thread Junio C Hamano
Brandon Turner b...@brandonturner.net writes: On Thu, Oct 9, 2014 at 3:45 PM, Junio C Hamano gits...@pobox.com wrote: Bugs are mine; as I do not use zsh myself, some testing is very much appreciated. I've tested this patch in zsh and it fixes the original problem. I've also tested various

Re: [PATCH v4] completion: ignore chpwd_functions when cding on zsh

2014-10-09 Thread Brandon Turner
On Thu, Oct 9, 2014 at 5:11 PM, Junio C Hamano gits...@pobox.com wrote: Actually the patch was slightly wrong. It did not quite matter as cd '' is a no-op, but git -C '' cmd is not that lenient (which may be something we may want to fix) and breaks t9902 by exposing an existing breakage in

[PATCH] git-svn.txt: advertise pushurl with dcommit

2014-10-09 Thread Sveinung Kvilhaugsvik
Advertise that the svn-remote.name.pushurl config key allows specifying the commit URL for the entire SVN repository in the documenation of git svn's dcommit command. Signed-off-by: Sveinung Kvilhaugsvik sveinun...@users.sourceforge.net --- Documentation/git-svn.txt | 4 1 file changed, 4