From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id 3E6D31F47D for ; Wed, 8 Mar 2023 19:41:01 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=jwrWjqfa; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229772AbjCHTk6 (ORCPT ); Wed, 8 Mar 2023 14:40:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229544AbjCHTk5 (ORCPT ); Wed, 8 Mar 2023 14:40:57 -0500 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 79F9160D54 for ; Wed, 8 Mar 2023 11:40:56 -0800 (PST) Received: by mail-pf1-x432.google.com with SMTP id fa28so10934693pfb.12 for ; Wed, 08 Mar 2023 11:40:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678304456; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=NfLZxwIViWtMbgVDVMnyp8+fwJLYJ0nlF7WMac49FhA=; b=jwrWjqfao3iyqfHNqVJG6s1jVDzti/eqXWWujHaRTXG6QMT6AdJh24s0W/Gq4pkw+c IOnmc8oVwIxrYkFT/x6TBhNFix8DlTm20ncLGFdi0ngigH59+v8FOwU3kfEfwoRS01qi Dwnn/UZKztWdIL+zbeLNBNZbO0LLZMH3m/OC5GC+THISxqpwVQiZJwxAsXO1f+apa6Y6 ZUuOkQwG0/rvo9Wjy1j+jxv/WohjSPBuxiFJtMJnvGmAK64NQFXWQD233Xh96kBKAwCj KzZ9nMCTI7CAWm7X/LkO43xic9pabt9ZUS8EKJQo9j4/Ev+ulkKY2CY5bOiarRpOjGLe yGKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678304456; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:sender:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=NfLZxwIViWtMbgVDVMnyp8+fwJLYJ0nlF7WMac49FhA=; b=I2D3gw0Y0VHy5GbTviP8BfzPOjhCdeiV2nwlOg4in+GoxeVj7jeQoSqmFEg8rvuHI/ H0lLQSvPtTW+z67vpkA1saCjRAj9YTsMiMMvm8DhhTOuexipKOw/K+wXh86Secbq77Gc P/RB4cntcudCxqb+A39p8NnT0Ykg7+xxTh+RXq+i5tCWhh467v9KNaNheFuWr0zadE+J O24LjxTdP86OTbYV10vNlJ3HtmGMIjPqahDrh5dNPCE1VHEHN1Odt5pG3gB7np2jBHqf 4fYw4y9P63w9rDAHis1G5EJ2PWzCA7IxSCI+hE9eoKnDhkG/JxnmggV/Jse/1Oo6Orvz rofw== X-Gm-Message-State: AO0yUKVNiFM+yZrNtbjmyrlCiF6yRgPEBGhos84DDgh3HwQNrKlS0tP2 jLzXURcDKymbPQB0n73GhjU= X-Google-Smtp-Source: AK7set+gEn6ZA+pEoCV9lD9MhMTGjRx8ibk0NbWcomiP/sUfZKUEHBcSjehHpv4Cg4ldDE8sQvY2VA== X-Received: by 2002:aa7:9607:0:b0:5e4:f700:f876 with SMTP id q7-20020aa79607000000b005e4f700f876mr16758637pfg.28.1678304455880; Wed, 08 Mar 2023 11:40:55 -0800 (PST) Received: from localhost (83.92.168.34.bc.googleusercontent.com. [34.168.92.83]) by smtp.gmail.com with ESMTPSA id y20-20020aa78554000000b00593a1f7c3dbsm10049838pfn.10.2023.03.08.11.40.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 11:40:55 -0800 (PST) Sender: Junio C Hamano From: Junio C Hamano To: Stefan Haller Cc: git@vger.kernel.org Subject: Re: When exactly should REBASE_HEAD exist? References: <961e68d7-5f43-c385-10fa-455b8e2f32d0@haller-berlin.de> <28b78355-e3db-d33a-c576-653740a4a1f3@haller-berlin.de> Date: Wed, 08 Mar 2023 11:40:54 -0800 In-Reply-To: <28b78355-e3db-d33a-c576-653740a4a1f3@haller-berlin.de> (Stefan Haller's message of "Wed, 8 Mar 2023 20:02:26 +0100") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Stefan Haller writes: > On 07.03.23 19:07, Junio C Hamano wrote: > ... >> Stepping a bit, how does our "git status" fare here? It shows what >> step in a sequence "rebase -i" the user who got control back (due to >> "break", "exec sh", "edit" or a conflicted "pick") is in. Or at >> least it tries to. Does it suffer from the same "great, but ..."? >> ... > > It fares a little better, but not much, and it doesn't look like I can > use its information to implement the behavior I want. Thanks. That is the kind of information I was trying to find. It means that the current "git status" does not give our users enough clue as to where in their "rebase -i" session they are at, and we will help more users by teaching "git status" the trick you are designing. Instead of peeking into how the implementation details like REBASE_HEAD currently happen to work, making sure underlying "git" knows how to present the information you want and letting it perform the heavy lifting would make sure the solution will stay supported across versions of future git.