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, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,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 45AE51F8C6 for ; Fri, 9 Jul 2021 15:23:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232318AbhGIP0M (ORCPT ); Fri, 9 Jul 2021 11:26:12 -0400 Received: from smtprelay05.ispgateway.de ([80.67.31.99]:49851 "EHLO smtprelay05.ispgateway.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231976AbhGIP0M (ORCPT ); Fri, 9 Jul 2021 11:26:12 -0400 Received: from [84.163.73.96] (helo=[192.168.2.202]) by smtprelay05.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1m1sKl-0002It-Ot; Fri, 09 Jul 2021 17:22:31 +0200 Subject: switch requires --detach [[Re: What actually is a branch]] To: Felipe Contreras , Sergey Organov Cc: Junio C Hamano , git@vger.kernel.org References: <7870a0ad-8fa1-9dbd-1978-1f44ec6970c5@mfriebe.de> <87wnqaclz8.fsf@osv.gnss.ru> <60e5f3981de5f_301437208bc@natae.notmuch> <87bl7d3l8r.fsf@osv.gnss.ru> <60e61bbd7a37d_3030aa2081a@natae.notmuch> <877di13hhe.fsf@osv.gnss.ru> <60e67389a4adc_306ac1208fd@natae.notmuch> <4057b3ac-a77c-0d5f-d3f4-ad781754aae4@mfriebe.de> <60e736e72da68_30939020850@natae.notmuch> <155308af-42ad-b044-fb37-676251a9b7e1@mfriebe.de> <60e762243aab1_30a7b02089@natae.notmuch> <2b85a7eb-d0be-65e7-ecbb-1750abf53e53@mfriebe.de> <60e79c31aaa72_30b8a4208c1@natae.notmuch> <084a355e-95cd-5c84-2fa5-a901da3e0e49@mfriebe.de> <60e8666c8707f_2153208c0@natae.notmuch> From: Martin Message-ID: <57f316cb-850d-706a-592b-4376f240e032@mfriebe.de> Date: Fri, 9 Jul 2021 17:23:23 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <60e8666c8707f_2153208c0@natae.notmuch> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Df-Sender: bWVAbWZyaWViZS5kZQ== Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On 09/07/2021 17:08, Felipe Contreras wrote: > and the fact that > `git switch` expects branches is one of the things that bothers me about > it. Ah, good point. I would word it differently though. "git switch forces the use of --detach if switching to a non branch" Bit of a twist. It's a nice safety for beginners. I remember when I started, I kept ending up detached. And I had no idea what to do next. But once you are a bit more experienced the need to add that option can be bothersome. It's not common in my workflow, but I can see that it can be an issue. So how to remedy? - Drop the option / Make it default? - add --allow-detach and git config switch.detach allow ? I don't really have a preference. I think its a nice protection, but even without it, the warning on entering detached HEAD state is pretty good. There is also a curious side effect. If you went into detached, you can go back to attached using git switch - but not back to detached by again doing git switch - Even though you had been there, and that means you had used --detached, and therefore known what you did.