Running make in contrib/subtree does not create executable

2014-08-17 Thread Jack Nagel
Running make in contrib/subtree no longer creates the git-subtree executable: $ git describe v2.1.0 $ make -C contrib/subtree /Library/Developer/CommandLineTools/usr/bin/make -C ../../ GIT-VERSION-FILE GIT_VERSION = 2.1.0 make[1]: `GIT-VERSION-FILE' is up to date.

[PATCH] subtree: make all default target of Makefile

2014-08-17 Thread Jeff King
You should be able to run make in contrib/subtree with no arguments and get the all target. This was broken by 8e2a5cc (contrib/subtree/Makefile: use GIT-VERSION-FILE, 2014-05-06), which put the rule for GIT-VERSION-FILE higher in the file. We can fix this by putting an empty all:: target at the

Re: [PATCH] run-command: introduce CHILD_PROCESS_INIT

2014-08-17 Thread Jeff King
On Sun, Aug 17, 2014 at 12:55:23AM +0200, René Scharfe wrote: Most struct child_process variables are cleared using memset right after declaration. Provide a macro, CHILD_PROCESS_INIT, that can be used to initialize them statically instead. That's shorter, doesn't require a function call

Re: Feature Request: `git remote prune --all`

2014-08-17 Thread Jeff King
On Sat, Aug 16, 2014 at 07:52:44PM -0500, Travis Carden wrote: I would like to propose the addition of a `git remote prune --all` command option or similar mechanism for pruning all remotes in a repository. For lack of such a feature, I've been using the following bash alias: alias

Re: [PATCH] run-command: introduce CHILD_PROCESS_INIT

2014-08-17 Thread René Scharfe
Am 17.08.2014 um 09:12 schrieb Jeff King: On Sun, Aug 17, 2014 at 12:55:23AM +0200, René Scharfe wrote: Most struct child_process variables are cleared using memset right after declaration. Provide a macro, CHILD_PROCESS_INIT, that can be used to initialize them statically instead. That's

Re: [PATCH v2 2/2] convert: Stream from fd to required clean filter instead of mmap

2014-08-17 Thread Jeff King
On Sat, Aug 16, 2014 at 06:26:08PM +0200, Steffen Prohaska wrote: Is the 15MB limit supposed to be imposed somewhere or is it just a guide of how much memory we expect Git to use in this scenario? The test should confirm that the the file that is added is not mmapped to memory. The

Re: [PATCH] run-command: introduce CHILD_PROCESS_INIT

2014-08-17 Thread Jeff King
On Sun, Aug 17, 2014 at 09:25:58AM +0200, René Scharfe wrote: I think one reason we never had an INIT macro here is that you cannot simply use the struct after zero-ing it anyway. That's just the first step, and then you have to tweak a bunch of fields to get what you want. So the memset is

Re: [PATCH] git-imap-send: simplify tunnel construction

2014-08-17 Thread Jeff King
On Wed, Aug 13, 2014 at 07:30:43PM +0200, Bernhard Reiter wrote: Signed-off-by: Bernhard Reiter ock...@raz.or.at --- imap-send.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) Thanks, this looks obviously correct and is a good direction. -Peff -- To unsubscribe from this list:

Re: [PATCH] http.c: die if curl_*_init fails

2014-08-17 Thread Jeff King
On Wed, Aug 13, 2014 at 07:31:24PM +0200, Bernhard Reiter wrote: diff --git a/http.c b/http.c index c8cd50d..afe4fc5 100644 --- a/http.c +++ b/http.c @@ -300,6 +300,9 @@ static CURL *get_curl_handle(void) { CURL *result = curl_easy_init(); + if (!result) +

Re: [PATCH] run-command: introduce CHILD_PROCESS_INIT

2014-08-17 Thread Johannes Sixt
Am 17.08.2014 00:55, schrieb René Scharfe: Most struct child_process variables are cleared using memset right after declaration. Provide a macro, CHILD_PROCESS_INIT, that can be used to initialize them statically instead. That's shorter, doesn't require a function call and is slightly more

Re: Sharing merge conflict resolution between multiple developers

2014-08-17 Thread Jeff King
On Mon, Aug 11, 2014 at 04:59:15PM +1200, Chris Packham wrote: Is there any way where we could share the conflict resolution around but still end up with a single merge commit. I'm thinking of something like the following workflow This came up once a while back. Here's the discussion:

Re: [PATCH] mailsplit.c: remove dead code

2014-08-17 Thread Jeff King
On Tue, Aug 12, 2014 at 06:38:38PM +0200, René Scharfe wrote: Am 11.08.2014 um 23:11 schrieb Stefan Beller: This was found by coverity. (Id: 290001) the variable 'output' is only assigned to a value inequal to NUL, after all gotos to the corrupt label. Therefore we can conclude the two

Re: [PATCH/RFC] git-imap-send: use libcurl for implementation

2014-08-17 Thread Jeff King
On Tue, Aug 12, 2014 at 06:59:17PM -0700, Jonathan Nieder wrote: + curl_socket_t sockfd = tunnel.out; // what about tunnel.in ? Hmm. curl expects to get a socket it can send(), recv(), setsockopt(), etc on instead of a pair of fds to read() and write(). I wonder if we could

Re: Not able to create feature branch Git

2014-08-17 Thread Jeff King
On Wed, Aug 13, 2014 at 01:32:56AM +0630, Arup Rakshit wrote: arup@linux-wzza:~/Ruby/yzz git push origin posward Warning: Permanently added the RSA host key for IP address '192.30.252.131' to the list of known hosts. ERROR: Permission to boris-s/yzz.git denied to aruprakshit. fatal: Could

Re: [PATCH] run-command: introduce CHILD_PROCESS_INIT

2014-08-17 Thread Jeff King
On Sun, Aug 17, 2014 at 09:46:42AM +0200, Johannes Sixt wrote: This is a step in the right direction, IMO. This way to initialize the struct feels mucth better because it does not depend on that the bit pattern of the NULL pointer is all zeros. I think platforms with NULL as something besides

Re: [PATCH v2 2/2] convert: Stream from fd to required clean filter instead of mmap

2014-08-17 Thread Steffen Prohaska
On Aug 16, 2014, at 7:00 PM, Andreas Schwab sch...@linux-m68k.org wrote: Steffen Prohaska proha...@zib.de writes: The test should confirm that the the file that is added is not mmapped to memory. RSS doesn't tell you that. You can mmap a big file without RSS getting bigger. All data

Re: [PATCH v2 2/2] convert: Stream from fd to required clean filter instead of mmap

2014-08-17 Thread Steffen Prohaska
On Aug 17, 2014, at 9:27 AM, Jeff King p...@peff.net wrote: On Sat, Aug 16, 2014 at 06:26:08PM +0200, Steffen Prohaska wrote: Is the 15MB limit supposed to be imposed somewhere or is it just a guide of how much memory we expect Git to use in this scenario? The test should confirm that

Re: [PATCH v2 2/2] convert: Stream from fd to required clean filter instead of mmap

2014-08-17 Thread Andreas Schwab
Steffen Prohaska proha...@zib.de writes: On Aug 16, 2014, at 7:00 PM, Andreas Schwab sch...@linux-m68k.org wrote: Steffen Prohaska proha...@zib.de writes: The test should confirm that the the file that is added is not mmapped to memory. RSS doesn't tell you that. You can mmap a big

Re: [PATCH v2 2/2] convert: Stream from fd to required clean filter instead of mmap

2014-08-17 Thread Duy Nguyen
On Sun, Aug 17, 2014 at 5:25 PM, Steffen Prohaska proha...@zib.de wrote: On Aug 17, 2014, at 9:27 AM, Jeff King p...@peff.net wrote: On Sat, Aug 16, 2014 at 06:26:08PM +0200, Steffen Prohaska wrote: Is the 15MB limit supposed to be imposed somewhere or is it just a guide of how much memory

Re: [PATCH/RFC] git-imap-send: use libcurl for implementation

2014-08-17 Thread Bernhard Reiter
Am 2014-08-17 um 10:30 schrieb Jeff King: On Tue, Aug 12, 2014 at 06:59:17PM -0700, Jonathan Nieder wrote: + curl_socket_t sockfd = tunnel.out; // what about tunnel.in ? Hmm. curl expects to get a socket it can send(), recv(), setsockopt(), etc on instead of a pair of fds to

Signinig a commit with multiple signatures

2014-08-17 Thread Jason Pyeron
I am working on an open source project right now where we are looking to enforce a N of M audit approval process. It turns out that git supports verifying multiple signatures because gpg supports signature merging. My question is how can this workflow best be added into git and if not added

Re: [ANNOUNCE] Git v2.1.0

2014-08-17 Thread Ramsay Jones
On 15/08/14 23:46, Junio C Hamano wrote: The latest feature release Git v2.1.0 is now available at the usual places. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/ The following public repositories all have a copy of the 'v2.1.0' tag and the 'master' branch

Bug: partially staged file is committed in whole, if there is another staged file

2014-08-17 Thread Paul Beckingham
If I have two modified files, and file1 is staged (git add file1), and file2 is partially staged (git add -p file2), and then try to commit only the partially staged file2, git commits *all* changes to file2, not just the staged part. There is no bug without file1 also being staged. Here is a

Re: [PATCH/RFC] git-imap-send: use libcurl for implementation

2014-08-17 Thread Jeff King
On Sun, Aug 17, 2014 at 02:56:10PM +0200, Bernhard Reiter wrote: I'm not sure if that would cause problems on Windows, though. Apparently socketpair is not available there. Googling socketpair windows yields, among a lot of other useful resources, the following relatively actively

Re: Bug: partially staged file is committed in whole, if there is another staged file

2014-08-17 Thread Junio C Hamano
Paul Beckingham p...@beckingham.net writes: $ git status -sb ## master M file1 MM file2 $ git commit file2 -m adding patch [master 066a6e2] adding patch 1 file changed, 2 insertions(+) $ git status -sb ## master M file1 $ You would likely to have seen $ git diff --name-only

Response

2014-08-17 Thread Wendy Nealon
Sent from my Boost Mobile phone.

Re: [ANNOUNCE] Git v2.1.0

2014-08-17 Thread Junio C Hamano
Theodore Ts'o ty...@mit.edu writes: On Fri, Aug 15, 2014 at 03:46:29PM -0700, Junio C Hamano wrote: The latest feature release Git v2.1.0 is now available at the usual places. I pulled down git v2.1.0, and when I tried to build it via: make prefix=/usr/local profile-fast The build

Re: [ANNOUNCE] Git v2.1.0

2014-08-17 Thread Junio C Hamano
Ramsay Jones ram...@ramsay1.demon.co.uk writes: Are you going to tag and push v2.1.0 to the documentation repos? I forgot to do the documentation build (which used to be triggered from post-receive hook at k.org and never had the risk of anybody forgetting, but it is all manual now---progress

Location of git config on Windows

2014-08-17 Thread Daniel Corbe
I installed git on my Windows machine while it was connected to my corporate network. It picked up on that fact and used a mapped drive to store its configuration file. As a result, I cannot currently use git when disconnected from my network. It throws the following error message: fatal:

RE: Location of git config on Windows

2014-08-17 Thread Jason Pyeron
-Original Message- From: Daniel Corbe Sent: Sunday, August 17, 2014 16:18 I installed git on my Windows machine while it was connected to my corporate network. It picked up on that fact and used a mapped drive to store its configuration file. As a result, I cannot

Re: Location of git config on Windows

2014-08-17 Thread Erik Faye-Lund
On Sun, Aug 17, 2014 at 10:18 PM, Daniel Corbe co...@corbe.net wrote: I installed git on my Windows machine while it was connected to my corporate network. It picked up on that fact and used a mapped drive to store its configuration file. As a result, I cannot currently use git when

Re: Location of git config on Windows

2014-08-17 Thread Karsten Blees
Am 18.08.2014 00:01, schrieb Erik Faye-Lund: On Sun, Aug 17, 2014 at 10:18 PM, Daniel Corbe co...@corbe.net wrote: I installed git on my Windows machine while it was connected to my corporate network. It picked up on that fact and used a mapped drive to store its configuration file. As a

Re: [PATCH] unblock and unignore SIGPIPE

2014-08-17 Thread Eric Wong
Patrick Reynolds patrick.reyno...@github.com wrote: But in the real world, several real potential callers, including Perl, Apache, and Unicorn, sometimes spawn subprocesses with SIGPIPE ignored. s/Unicorn/Ruby/ But unicorn would ignore SIGPIPE it if Ruby did not; relying on SIGPIPE while

make profile issue on Git 2.1.0

2014-08-17 Thread Andrés Sicard-Ramírez
Hi, I have the following issue on Git 2.1.0: $ make prefix=/some-directory profile ... make[2]: Entering directory `/home/asr/src/git/git-2.1.0/t/perf' rm -rf test-results ./run === Running 9 tests in this tree === error: No $GIT_PERF_REPO defined, and your build directory is not a repo error:

Re: Feature Request: `git remote prune --all`

2014-08-17 Thread Travis Carden
Thanks, guys! `git fetch --all --prune` satisfies my request. I appreciate the education! On Sun, Aug 17, 2014 at 2:18 AM, Jeff King p...@peff.net wrote: On Sat, Aug 16, 2014 at 07:52:44PM -0500, Travis Carden wrote: I would like to propose the addition of a `git remote prune --all` command