Re: What's cooking in git.git (Jul 2013, #03; Tue, 9)

2013-07-23 Thread Ramkumar Ramachandra
Junio C Hamano wrote: * mv/merge-ff-tristate (2013-07-02) 1 commit (merged to 'next' on 2013-07-09 at c32b95d) + merge: handle --ff/--no-ff/--ff-only as a tri-state option Sorry I didn't notice sooner, but I was confused by the second test title this added: test_expect_success 'option

Re: What's cooking in git.git (Jul 2013, #03; Tue, 9)

2013-07-23 Thread Miklos Vajna
Hi, On Tue, Jul 23, 2013 at 12:53:25PM +0530, Ramkumar Ramachandra artag...@gmail.com wrote: Junio C Hamano wrote: * mv/merge-ff-tristate (2013-07-02) 1 commit (merged to 'next' on 2013-07-09 at c32b95d) + merge: handle --ff/--no-ff/--ff-only as a tri-state option Sorry I didn't

Re: What's cooking in git.git (Jul 2013, #03; Tue, 9)

2013-07-23 Thread Junio C Hamano
Miklos Vajna vmik...@suse.cz writes: How is --ff-only overwriting merge.ff=only here? Was it a typo? Yes, it's a typo in the test name. Thanks for spotting that! Thanks, will do this: Subject: [PATCH] t7600: fix typo in test title Spotted by Ram, confirmed by Miklos. Signed-off-by: Junio

Re: What's cooking in git.git (Jul 2013, #03; Tue, 9)

2013-07-19 Thread Junio C Hamano
Ramsay Jones ram...@ramsay1.demon.co.uk writes: Junio C Hamano wrote: [ ... ] * rr/send-email-ssl-verify (2013-07-06) 6 commits - SQUASH??? update to support SSL_ca_file as well as SSL_ca_path - SQUASH??? send-email: cover both smtps and starttls cases - fixup! send-email: squelch

Re: What's cooking in git.git (Jul 2013, #03; Tue, 9)

2013-07-15 Thread Junio C Hamano
Ramsay Jones ram...@ramsay1.demon.co.uk writes: [Stalled] * rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits - ### DONTMERGE: needs better explanation on what config they need - pack-refs.c: Add missing call to git_config() - show-ref.c: Add missing call to

Re: What's cooking in git.git (Jul 2013, #03; Tue, 9)

2013-07-11 Thread Junio C Hamano
Kyle McKay mack...@gmail.com writes: On Jul 9, 2013, at 16:09, Junio C Hamano wrote: * km/svn-1.8-serf-only (2013-07-07) 2 commits - git-svn: allow git-svn fetching to work using serf - Git.pm: add new temp_is_locked function Comments? Since neither David nor Jonathan have piped in here

Re: What's cooking in git.git (Jul 2013, #03; Tue, 9)

2013-07-11 Thread Junio C Hamano
Matthieu Moy matthieu@imag.fr writes: Junio C Hamano gits...@pobox.com writes: * bp/mediawiki-preview (2013-07-08) 7 commits - git-remote-mediawiki: add preview subcommand into git mw - git-remote-mediawiki: add git-mw command - git-remote-mediawiki: factoring code between

Re: What's cooking in git.git (Jul 2013, #03; Tue, 9)

2013-07-10 Thread Kyle McKay
On Jul 9, 2013, at 16:09, Junio C Hamano wrote: * km/svn-1.8-serf-only (2013-07-07) 2 commits - git-svn: allow git-svn fetching to work using serf - Git.pm: add new temp_is_locked function Comments? Since neither David nor Jonathan have piped in here (they were the two primarily involved

Re: What's cooking in git.git (Jul 2013, #03; Tue, 9)

2013-07-10 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: * bp/mediawiki-preview (2013-07-08) 7 commits - git-remote-mediawiki: add preview subcommand into git mw - git-remote-mediawiki: add git-mw command - git-remote-mediawiki: factoring code between git-remote-mediawiki and Git::Mediawiki -

Re: What's cooking in git.git (Jul 2013, #03; Tue, 9)

2013-07-09 Thread Jeff King
On Tue, Jul 09, 2013 at 04:09:35PM -0700, Junio C Hamano wrote: * jk/argv-pushf-sentinel (2013-07-09) 1 commit - argv-array: add sentinel attribute to argv_array_pushl Will merge to 'next'. If you have not pushed it out already, I just posted a re-roll which covers many other places, too.