[PATCH] revision: avoid work after --max-count is reached

2012-07-13 Thread Jeff King
During a revision traversal in which --max-count has been specified, we decrement a counter for each revision returned by get_revision. When it hits 0, we typically return NULL (the exception being if we still have boundary commits to show). However, before we check the counter, we call

Re: [PATCH] revision: avoid work after --max-count is reached

2012-07-13 Thread Jeff King
On Fri, Jul 13, 2012 at 03:50:23AM -0400, Jeff King wrote: revision.c | 39 +++ 1 file changed, 19 insertions(+), 20 deletions(-) BTW, the patch is slightly hard to read because of the re-indentation. Here it is with -w -U5: diff --git a/revision.c

Re: git cloning paths

2012-07-13 Thread Jeff King
On Thu, Jul 12, 2012 at 03:17:09PM -0700, Douglas Garstang wrote: I'm a relative newcomer to git and I've just inherited a setup where all of the company's code is in a single git repository. Within this repository are multiple projects. It seems that git doesn't natively allow

Re: [PATCH] config: fix several access(NULL) calls

2012-07-13 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: But is it really true that we want to error out on missing HOME if we have usable XDG stuff? Anyone else have an opinion on this? In short, the question is whether export XDG_CONFIG_HOME=some-existing-dir unset HOME git config foo.baz boz

Re: [PATCH 0/7] Add support for Freescale's mc34708 to mc13xxx driver

2012-07-13 Thread Uwe Kleine-König
Hello, [I added git@vger.k.o to Cc: please strip the recipents accordingly if you reply.] On Fri, Jul 13, 2012 at 09:02:56AM +1000, Marc Reilly wrote: Hi Uwe, This series was tested on a Phytec pcm038 (mc13783 on spi) using traditional boot (i.e. not dt) and on a i.MX53 based machine

[PATCH v2] config: fix several access(NULL) calls

2012-07-13 Thread Matthieu Moy
When $HOME is unset, home_config_paths fails and returns NULL pointers for user_config and xdg_config. Valgrind complains with Syscall param access(pathname) points to unaddressable byte(s). Don't call blindly access() on these variables, but test them for NULL-ness before. The when the XDG

Re: Export from bzr / Import to git results in a deleted file re-appearing

2012-07-13 Thread Andreas Schwab
Jeff King p...@peff.net writes: On Thu, Jul 12, 2012 at 08:00:17PM +0200, Felix Natter wrote: I am trying to move freeplane's repository (GPL-project) from bzr to git, but when I do this: $ mkdir freeplane-git1 $ cd freeplane-git1 $ git init . $ bzr fast-export

Re: Export from bzr / Import to git results in a deleted file re-appearing

2012-07-13 Thread Jeff King
On Fri, Jul 13, 2012 at 11:04:21AM +0200, Andreas Schwab wrote: If you run only the bzr half of your command and inspect the output, you will see that the file in question is mentioned twice. Once in a commit on refs/heads/master that renames into it from another file: R

Re: [PATCH] config: fix several access(NULL) calls

2012-07-13 Thread Matthieu Moy
Jeff King p...@peff.net writes: On Fri, Jul 13, 2012 at 10:48:18AM +0200, Matthieu Moy wrote: Junio C Hamano gits...@pobox.com writes: But is it really true that we want to error out on missing HOME if we have usable XDG stuff? Anyone else have an opinion on this? In short, the

Re: Export from bzr / Import to git results in a deleted file re-appearing

2012-07-13 Thread Andreas Schwab
Jeff King p...@peff.net writes: On Fri, Jul 13, 2012 at 11:04:21AM +0200, Andreas Schwab wrote: If you run only the bzr half of your command and inspect the output, you will see that the file in question is mentioned twice. Once in a commit on refs/heads/master that renames into it from

Re: [PATCH] config: fix several access(NULL) calls

2012-07-13 Thread Thomas Rast
Matthieu Moy matthieu@grenoble-inp.fr writes: Jeff King p...@peff.net writes: On Fri, Jul 13, 2012 at 10:48:18AM +0200, Matthieu Moy wrote: Junio C Hamano gits...@pobox.com writes: But is it really true that we want to error out on missing HOME if we have usable XDG stuff?

Re: [PATCH] config: fix several access(NULL) calls

2012-07-13 Thread Matthieu Moy
Thomas Rast tr...@student.ethz.ch writes: Umm, are you sure? I may be somewhat confused about this, but the tests I used to trigger the access(NULL) were IIRC unset HOME git config --get foo.bar git config --global --get foo.bar none of which is writing I was inaccurate, but

Don't share anything but those files

2012-07-13 Thread Yves Perron
Greetings everyone, I'm wondering how to commit only selected files/folders on GIT, if even possible. Note, the ignore list is not a good option for me as I'd like to add a few files in a folder that contains many hundreds for instance. Basically, I'm looking for a way to say, don't share

Don't share anything but those files

2012-07-13 Thread Yves Perron
Greetings everyone, I'm wondering how to commit only selected files/folders on GIT, if even possible. Note, the ignore list is not a good option for me as I'd like to add a few files in a folder that contains many hundreds for instance. Basically, I'm looking for a way to say, don't share

[PATCH v2] git-am: indicate where a failed patch is to be found.

2012-07-13 Thread Paul Gortmaker
If git am fails to apply something, the end user may need to know where to find the patch. This is normally known for a single patch, but if the user is processing a mbox with many patches, they may not have a single broken out patch handy. So, provide a helpful hint as to where they can find

Re: Don't share anything but those files

2012-07-13 Thread Edward Toroshchin
On Fri, Jul 13, 2012 at 11:35:36AM -0400, Yves Perron wrote: Oh I see, thank you for your response, Can I put all the folders/files I want to add in a config file so I don't have to do this every time? Thx You won't have to do this every time. Once you add a file and commit it, git

Re: [PATCH] config: fix several access(NULL) calls

2012-07-13 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: The old code was: if (use_global_config) { char *home = getenv(HOME); if (home) { char *user_config = xstrdup(mkpath(%s/.gitconfig, home));

Re: [PATCH] git-am: indicate where a failed patch is to be found.

2012-07-13 Thread Paul Gortmaker
On 12-07-12 04:00 PM, Junio C Hamano wrote: Paul Gortmaker paul.gortma...@windriver.com writes: This is _NOT_ fine, especially if you suggest patch the user may not have, and more importantly does not have a clue why git apply rejected it (am does _not_ use patch at all). I'm not 100% sure

Re: Don't share anything but those files

2012-07-13 Thread Yves Perron
Ok, let me rephrase, is there a way to edit a file where we can put every files/folders we need to add without the need of entering a command for each entry? On 7/13/2012 12:14 PM, Edward Toroshchin wrote: On Fri, Jul 13, 2012 at 11:35:36AM -0400, Yves Perron wrote: Oh I see, thank you for

Re: Don't share anything but those files

2012-07-13 Thread Taylor Hedberg
Yves Perron, Fri 2012-07-13 @ 13:40:56-0400: Ok, let me rephrase, is there a way to edit a file where we can put every files/folders we need to add without the need of entering a command for each entry? Sure, but you don't need functionality built in to Git to do this. Just list the paths you

Re: [PATCH] git-am: indicate where a failed patch is to be found.

2012-07-13 Thread Junio C Hamano
Paul Gortmaker paul.gortma...@windriver.com writes: Sorry, that description was a bit context free. Two typical cases: 1) applying a series of commits (e.g. preempt RT feature) to a newer baseline. Some of those commits may have been upstreamed and now present in mainline. The git am

Re: Don't share anything but those files

2012-07-13 Thread Illia Bobyr
On 7/13/2012 8:21 AM, Edward Toroshchin wrote: On Fri, Jul 13, 2012 at 10:59:55AM -0400, Yves Perron wrote: I'm wondering how to commit only selected files/folders on GIT, if even possible. Just git add only the files you need. If you want git to ignore all the rest, you can write '*' in

Re: Don't share anything but those files

2012-07-13 Thread Yves Perron
On 7/13/2012 2:08 PM, Illia Bobyr wrote: * !.gitignore !a_file_that_should_be_tracked !a_dir_to_track/ That is exactly what i was hoping for, thank you everyone! -- -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

Re: [PATCH 2/6] Teach remote.c about the remote.default configuration setting.

2012-07-13 Thread Marc Branchaud
On 12-07-11 06:04 PM, Junio C Hamano wrote: Marc Branchaud marcn...@xiplink.com writes: On 12-07-11 02:21 PM, Junio C Hamano wrote: marcn...@xiplink.com writes: From: Marc Branchaud marcn...@xiplink.com The code now has a default_remote_name and an effective_remote_name: -

Re: [PATCH 0/7] Add support for Freescale's mc34708 to mc13xxx driver

2012-07-13 Thread Junio C Hamano
Uwe Kleine-König u.kleine-koe...@pengutronix.de writes: It doesn't move it around, that's only how it looks. I removed enum mc13xxx_id (above MC13XXX_NUMREGS) and added struct mc13xxx_variant (below MC13XXX_NUMREGS). Git choosed to use the closing brace of enum mc13xxx_id and struct

Re: [PATCH 3/6] Teach git remote about remote.default.

2012-07-13 Thread Marc Branchaud
On 12-07-11 05:55 PM, Junio C Hamano wrote: Marc Branchaud marcn...@xiplink.com writes: What about a warning displayed if remote.default is not set? Something like: This repository does not have an explicitly configured default remote. Selecting origin as the default remote

Re: [PATCH v2] git-am: indicate where a failed patch is to be found.

2012-07-13 Thread Junio C Hamano
Paul Gortmaker paul.gortma...@windriver.com writes: If git am fails to apply something, the end user may need to know where to find the patch. This is normally known for a single patch, but if the user is processing a mbox with many patches, they may not have a single broken out patch

Re: [PATCH 2/6] Teach remote.c about the remote.default configuration setting.

2012-07-13 Thread Junio C Hamano
Marc Branchaud marcn...@xiplink.com writes: Is it even a _side effect_? Isn't this one of the primary points of the series? I do not think this patch makes sense if we did not want that change to happen. Or am I missing something? No, you're not -- I agree that this change in behaviour

Re: [PATCH] revision: avoid work after --max-count is reached

2012-07-13 Thread Jeff King
On Fri, Jul 13, 2012 at 02:10:54PM -0700, Junio C Hamano wrote: Jeff King p...@peff.net writes: There's no need to make this get_revision_1 call when our counter runs out. If we are not in --boundary mode, we will just throw away the result and immediately return NULL. If we are in

Re: [PATCH v2] git-am: indicate where a failed patch is to be found.

2012-07-13 Thread Paul Gortmaker
On 12-07-13 03:58 PM, Junio C Hamano wrote: Paul Gortmaker paul.gortma...@windriver.com writes: If git am fails to apply something, the end user may need to know where to find the patch. This is normally known for a single patch, but if the user is processing a mbox with many patches, they

Re: Mini bug report origin/pu: t1512 failed on Mac OS X (commit 957d74062c1f0e ?)

2012-07-13 Thread Stefano Lattarini
On 07/12/2012 01:30 AM, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: I think the other tests in t/ prefer to unquote it so that we would ignore spaces around wc -l output, i.e. test $(wc -l actual) = 16 Thanks for a report. -- 8 -- Subject: [PATCH] t1512: ignore

Re: [PATCH v2] git-am: indicate where a failed patch is to be found.

2012-07-13 Thread Junio C Hamano
Paul Gortmaker paul.gortma...@windriver.com writes: I'm fine with the changes you've proposed below,... Here is what I committed for today's integration run. Will be pushed out on 'pu'. Thanks. -- 8 -- From: Paul Gortmaker paul.gortma...@windriver.com Date: Fri, 13 Jul 2012 11:51:30 -0400

Re: Mini bug report origin/pu: t1512 failed on Mac OS X (commit 957d74062c1f0e ?)

2012-07-13 Thread Junio C Hamano
Stefano Lattarini stefano.lattar...@gmail.com writes: On 07/12/2012 01:30 AM, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: I think the other tests in t/ prefer to unquote it so that we would ignore spaces around wc -l output, i.e. test $(wc -l actual) = 16 Thanks

What's cooking in git.git (Jul 2012, #04; Fri, 13)

2012-07-13 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'. The sixth batch of topics are now in 'master'. You can find the changes described here in the integration branches of the repositories listed

Support of '^' as alias for 'HEAD^'

2012-07-13 Thread Zeeshan Ali (Khattak)
Hi, Many times I want to refer to 'HEAD^', 'HEAD^^' and sometimes even further up the tree. It would be really nice if I didn't have to type 'HEAD^' but could only type '^'. Bash completion make things easier but it automatically inserts a space immediately after HEAD so you have to hit

Re: Git Garbage Collect Error.

2012-07-13 Thread sascha-ml
On Thursday 12 July 2012 05:32:21 Jeff King wrote: [...] which means you are probably not even getting to use all 4Gb of your address space (my impression is that without special flags, 32-bit Windows processes are limited to 2Gb of address space). Indeed, that's how windows partitions memory