From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-6.3 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 7B3E72070C for ; Wed, 6 Jul 2016 14:41:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754017AbcGFOlU (ORCPT ); Wed, 6 Jul 2016 10:41:20 -0400 Received: from pb-smtp2.pobox.com ([64.147.108.71]:62830 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753825AbcGFOlT (ORCPT ); Wed, 6 Jul 2016 10:41:19 -0400 Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 676BB26758; Wed, 6 Jul 2016 10:41:18 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=PzAyBt3ritqlZUk+3MKqSuQ/16c=; b=KWUFhX D0OpGmNJbOlZoR7a7C6bJq6gAHpLXC4cNPAk31AbiVakdCTkRdbA8+7vwPS5DWwj jlzuhRf0MCTor6+rkJ357XnywwiIuehBAnlIzBrIHKFwwqYC34rEuNXzvqXVjOos CZR8ga5phm/CNhtGXpqmCY4PNoTLVm6VzpcXo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=gWXEZI1oVcmxC2Tu5xToD+JS0PmMb3Ex 3W2ZmjbT+1kjFPJLFODcxlV3R2kdAZXcVT6AvynubjZywRl61xPea+jz/URrn2cX n1exThfWZIm+JyOHNf/hw7ZDvzZFTVv0vTPS/PMMoAs2J29nstthbaRelIT7lAWQ LcH4NP5yq8g= Received: from pb-smtp2.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 5EA0C26757; Wed, 6 Jul 2016 10:41:18 -0400 (EDT) Received: from pobox.com (unknown [104.132.0.95]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by pb-smtp2.pobox.com (Postfix) with ESMTPSA id D485926756; Wed, 6 Jul 2016 10:41:17 -0400 (EDT) From: Junio C Hamano To: Johannes Schindelin Cc: git@vger.kernel.org Subject: Re: What's cooking in git.git (Jul 2016, #01; Fri, 1) References: Date: Wed, 06 Jul 2016 07:41:15 -0700 In-Reply-To: (Johannes Schindelin's message of "Sat, 2 Jul 2016 13:09:42 +0200 (CEST)") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: B2AEB2FC-4387-11E6-B04B-EE617A1B28F4-77302942!pb-smtp2.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Johannes Schindelin writes: > Hi Junio, > > On Fri, 1 Jul 2016, Junio C Hamano wrote: > >> * jc/t2300-setup (2016-06-22) 1 commit >> (merged to 'next' on 2016-06-28 at 62b902a) >> + t2300: "git --exec-path" is not usable in $PATH on Windows as-is >> >> Portability fix for Windows. >> >> Will merge to 'master'. > > Would you mind cherry-picking this onto `maint`, too? I just noticed that > the test suite does not pass here because `maint` has fe17fc0 (t2300: run > git-sh-setup in an environment that better mimics the real life, > 2016-06-01). s/cherry-pick/merge/; You'd notice I was prepared if you did "git log maint..jc/t2300-setup" ;-) > While at it, it would be nice if this patch: > >> * js/mingw-parameter-less-c-functions (2016-06-20) 1 commit >> (merged to 'next' on 2016-06-28 at e673c65) >> + mingw: let the build succeed with DEVELOPER=1 >> >> Some platform-specific code had non-ANSI strict declarations of C >> functions that do not take any parameters, which has been >> corrected. >> >> Will merge to 'master'. > > ... also found its way into maint; This would make it easier for me to > backport fixes (as I started to rely on DEVELOPER=1 to warn about issues). Likewise. I'm sure I'll forget, so if you can please remind me a few weeks after these are merged to 'master'. Thanks.