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=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,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 5E9B81F8C6 for ; Fri, 16 Jul 2021 16:54:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229621AbhGPQ5O (ORCPT ); Fri, 16 Jul 2021 12:57:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229462AbhGPQ5N (ORCPT ); Fri, 16 Jul 2021 12:57:13 -0400 Received: from mail.aixigo.de (mail.aixigo.de [IPv6:2001:67c:13b0:ffff::60]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A8617C06175F for ; Fri, 16 Jul 2021 09:54:18 -0700 (PDT) Received: from mailhost.ac.aixigo.de (mailhost.ac.aixigo.de [172.19.96.11]) by mail.aixigo.de (OpenSMTPD) with ESMTPS id 51af5f4e (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Fri, 16 Jul 2021 18:54:15 +0200 (CEST) Received: from vmdpcl078.ac.aixigo.de ([172.19.100.218]) by mailhost.ac.aixigo.de (8.15.2/8.15.2/Debian-14~deb10u1) with ESMTPS id 16GGsFr82366252 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT); Fri, 16 Jul 2021 18:54:15 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aixigo.com; s=default; t=1626454455; bh=rxT33QReyRgzP83jJyEW0yuLnvgXbcrWHDA5rvpgjTE=; h=To:Cc:References:From:Subject:Date:In-Reply-To:From; b=sgLRXxUCSXd85UfeI4bJenjY+Aq/S2OTr0/EthuQZ2LECIC5g5QudV2gSRP5L2Dpz wLI0PsJjwMdIk2XrCcyTFJpMnVgx8kPAGyBk1o3U3+wmcDG6CzizUX5J4ZdTw/BD/o heG63UY8uls1PJcLUFRCTvNHwwW6vzGp/9r3Wo84= To: Felipe Contreras , Elijah Newren Cc: "git@vger.kernel.org" References: <60f1b7853b8a2_ade9208c1@natae.notmuch> From: Matthias Baumgarten Subject: Re: pull.rebase config vs. --ff-only on command line Message-ID: <00b50aa6-9b61-9f80-1d8d-2db3ed5e7638@aixigo.com> Date: Fri, 16 Jul 2021 18:54:10 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <60f1b7853b8a2_ade9208c1@natae.notmuch> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: de-DE Content-Transfer-Encoding: 8bit X-Virus-Scanned: clamav-milter 0.103.2 at srvvm01.ac.aixigo.de X-Virus-Status: Clean Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On 7/16/21 6:44 PM, Felipe Contreras wrote: > Elijah Newren wrote: >> On Fri, Jul 16, 2021 at 7:52 AM Matthias Baumgarten >> wrote: >>> this is my first time contacting you guys and girls so I hope this mail >>> achieves the expected standard. I've discovered the following behaviour >>> of git: >>> >>> If pull.rebase is configured to true and git pull --ff-only is executed >>> it seems like the config wins, i.e. issuing "Successfully rebased and >>> updated refs/heads/...", which is not what I would expect. I always >>> believed that command line options would overwrite configured options. >>> >>> Is my assumption that command line options always win wrong or is this a >>> bug? >> >> It's a bug. > > No it isn't. > > Elijah is elevating to fact his opinion of what --ff-only should be > changed to. > > But it has not been changed. Today --ff-only is meant only for the merge > mode of `git pull`, and like other merge-only options (e.g. --ff, > --no-ff, and --squash) it's ignored in the rebase mode. > Shouldn't every explicitly given merge option (like --ff-only) overwrite any configured option that would not even result in a merge, i.e. forcing a merge and thus forcing ff-only? -- aixigo AG Karl-Friedrich-Str. 68, 52072 Aachen, Germany phone: +49 (0)241 559709-390, fax: +49 (0)241 559709-99 email: matthias.baumgarten@aixigo.com web: https://www.aixigo.com District Court Aachen – HRB 8057 Board: Christian Friedrich, Tobias Haustein Chairman of the Supervisory Board: Dr. Roland Schlager