From mboxrd@z Thu Jan 1 00:00:00 1970 From: SZEDER =?iso-8859-1?Q?G=E1bor?= Subject: [BUG] merge --no-ff --no-commit && commit Date: Fri, 26 Sep 2008 01:50:29 +0200 Message-ID: <20080925235029.GA15837@neumann> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: git@vger.kernel.org To: Miklos Vajna X-From: git-owner@vger.kernel.org Fri Sep 26 01:51:50 2008 connect(): Connection refused Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1Kj0cc-0008Ni-7E for gcvg-git-2@gmane.org; Fri, 26 Sep 2008 01:51:46 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753861AbYIYXuf convert rfc822-to-quoted-printable (ORCPT ); Thu, 25 Sep 2008 19:50:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753021AbYIYXuf (ORCPT ); Thu, 25 Sep 2008 19:50:35 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:61777 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753798AbYIYXue (ORCPT ); Thu, 25 Sep 2008 19:50:34 -0400 Received: from [127.0.1.1] (p5B13352D.dip0.t-ipconnect.de [91.19.53.45]) by mrelayeu.kundenserver.de (node=mrelayeu5) with ESMTP (Nemesis) id 0ML25U-1Kj0bP1LN8-00060u; Fri, 26 Sep 2008 01:50:33 +0200 Content-Disposition: inline User-Agent: Mutt/1.5.17+20080114 (2008-01-14) X-Provags-ID: V01U2FsdGVkX19ykPxTqF89/sD4VONcLf+LUMlAzileAubg7xR IzZrgXtx5BbdbOcAdmGtbQUQbwsR+WNaGVcv/0QBhk1Kjo8s1p Xaatn5qvg+T3uptOWz3OQ== Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Hi, after today's update on master, the merge commit generated by 'git merge --no-ff --no-commit branch && git commit' has only one parent if the merge can be resolved as a fast forward. The test case below demonstrates this behaviour. Bisecting showed that the regression was introduced by commit 6bb6b034 (builtin-commit: use commit_tree(), 2008-09-10). Regards, G=E1bor -- >8 -- diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 9516f54..98cfc53 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -511,4 +511,13 @@ test_expect_success 'in-index merge' ' =20 test_debug 'gitk --all' =20 +test_expect_success 'merge --no-ff --no-commit && commit' ' + git reset --hard c0 && + git merge --no-ff --no-commit c1 && + EDITOR=3D: git commit && + verify_parents $c0 $c1 +' + +test_debug 'gitk --all' + test_done