From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 530611F9F4 for ; Thu, 18 Nov 2021 04:54:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243076AbhKRE5C (ORCPT ); Wed, 17 Nov 2021 23:57:02 -0500 Received: from pb-smtp1.pobox.com ([64.147.108.70]:64786 "EHLO pb-smtp1.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243072AbhKRE5B (ORCPT ); Wed, 17 Nov 2021 23:57:01 -0500 Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 4C71CFD7C6; Wed, 17 Nov 2021 23:54:01 -0500 (EST) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:message-id:mime-version:content-type :content-transfer-encoding; s=sasl; bh=NMh2vD7HZqbcgi6j1EfFi/FdD 7sWinwOM3+MWwn5QHE=; b=WBaxwB+tK5bBUkdz1ZmXcyE0WMW6J2Dfipyj+njnC YhdrT6kgNDQ3MSrIZDLuOT4+lZtp9kBVOIlomRhkmG7MZ+L7ulTQK5aWItB7kubf j2JfJ3O5OJrwOewcZZQssUe5aufxjp5JfBZO1ZlWSWJ8d/7iZ1bJ9TkilzsvBd8o 8I= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 0B340FD7C5; Wed, 17 Nov 2021 23:54:01 -0500 (EST) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [104.133.2.91]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp1.pobox.com (Postfix) with ESMTPSA id 29E60FD7C3; Wed, 17 Nov 2021 23:54:00 -0500 (EST) (envelope-from junio@pobox.com) From: Junio C Hamano To: "Thomas Koutcher via GitGitGadget" Cc: git@vger.kernel.org, =?utf-8?B?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , Thomas Koutcher Subject: Re: [PATCH v2] subtree: force merge commit References: Date: Wed, 17 Nov 2021 20:53:59 -0800 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 X-Pobox-Relay-ID: 8B716960-482B-11EC-9B29-62A2C8D8090B-77302942!pb-smtp1.pobox.com Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org "Thomas Koutcher via GitGitGadget" writes: > From: Thomas Koutcher > > When `merge.ff` is set to `only` in .gitconfig, `git subtree pull` will > fail with error `fatal: Not possible to fast-forward, aborting.`, but > the command does want to make merges in these places. Add `--no-ff` > argument to `git merge` to enforce this behaviour. > > Reviewed-by: =C3=86var Arnfj=C3=B6r=C3=B0 Bjarmason > Reviewed-by: Junio C Hamano Reviewed-by: is a bit tricky. If you are sending a corrected version after other people just took a look at a previous iteration, you cannot generally have them for two reasons. First of all, they haven't said that you can have Reviewed-by: under there name (which means that they are completely satisfied after giving a thorough analysis). Also, the version you are sending is different from what they reviewed, so even if they were happy with the previous iteration, it does not mean they would be with this version. > diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtr= ee.sh > index 7f767b5c38f..cb51aee4cbf 100755 > --- a/contrib/subtree/git-subtree.sh > +++ b/contrib/subtree/git-subtree.sh > @@ -976,10 +976,10 @@ cmd_merge () { > =20 > if test -n "$arg_addmerge_message" > then > - git merge -Xsubtree=3D"$arg_prefix" \ > + git merge --no-ff -Xsubtree=3D"$arg_prefix" \ > --message=3D"$arg_addmerge_message" "$rev" > else > - git merge -Xsubtree=3D"$arg_prefix" $rev > + git merge --no-ff -Xsubtree=3D"$arg_prefix" $rev > fi > } Thanks. I'll drop these two reviewed-by lines while queuing.