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,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 22C501F953 for ; Fri, 17 Dec 2021 00:45:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230438AbhLQAp3 (ORCPT ); Thu, 16 Dec 2021 19:45:29 -0500 Received: from pb-smtp2.pobox.com ([64.147.108.71]:55834 "EHLO pb-smtp2.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230251AbhLQAp2 (ORCPT ); Thu, 16 Dec 2021 19:45:28 -0500 Received: from pb-smtp2.pobox.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 062D0EFD36; Thu, 16 Dec 2021 19:45:28 -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:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=AEsE6zLRdMRob+tHWHHYA/V7etLbNBTF31SuXg sbsPw=; b=ygT6AuA0GXs3sZL5K7DE79DUPBT+kaVr8Yo5GzSKd95JuhfPp9f+jh 2gs00SeVu9HiiMAi78kYZuRUtdmnGdYJDev6aYEek/ZCqG0SwCOUZzQVZKZQ5kft bGTufrdL5A2E3aOD54315q/k8dq3CqKQR4rHBItvOYYAwPbEb6RM8= Received: from pb-smtp2.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id F04EEEFD35; Thu, 16 Dec 2021 19:45:27 -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-smtp2.pobox.com (Postfix) with ESMTPSA id 67705EFD34; Thu, 16 Dec 2021 19:45:27 -0500 (EST) (envelope-from junio@pobox.com) From: Junio C Hamano To: Glen Choo Cc: git@vger.kernel.org, Jonathan Tan , Josh Steadmon , Emily Shaffer , =?utf-8?B?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , Philippe Blain Subject: Re: [PATCH v5 0/5] implement branch --recurse-submodules References: <20211216003213.99135-1-chooglen@google.com> <20211216233324.65126-1-chooglen@google.com> Date: Thu, 16 Dec 2021 16:45:26 -0800 In-Reply-To: (Junio C. Hamano's message of "Thu, 16 Dec 2021 16:34:32 -0800") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: A0BB08C2-5ED2-11EC-AD91-CB998F0A682E-77302942!pb-smtp2.pobox.com Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Junio C Hamano writes: > Glen Choo writes: > >> This series implements branch --recurse-submodules as laid out in the >> Submodule branching RFC (linked above). If there are concerns about the >> UX/behavior, I would appreciate feedback on the RFC thread as well :) >> >> This series is based off js/branch-track-inherit. > > Sigh. > > When a series is labelled as "based off of X", I expect that the > series either apply on the tip of branch X I have, or it applies on > top of the merge result of branch X into 'master'. It shouldn't be > forked at a random point on the 'seen' or 'next' branch, as you'd > end up depending on not just X but all the other topics that are > merged before X is merged to these integration branches. > > This seems not apply on either c99fa303 (config: require lowercase > for branch.autosetupmerge, 2021-12-14), which is the tip of the > js/branch-track-inherit topic, or 47e85bee (Merge branch > 'js/branch-track-inherit' into gc/branch-recurse-submodules, > 2021-12-15), which is a merge of that topic into 'master' I prepared > to queue the previous round of this topic the other day. Ah, I figured it out. These are based on the merge of the other branch into 'seen'. I have (deliberately) merged js/branch-track-inherit and the previous round of this tipc in 'seen' next to each other. And when these five are applied on top of that merge of the other topic into 'seen', we get an identical tree as the merge of the previous round of this topic into 'seen'. So unless you updated some commit log message, nothing is lost if I ignore this round. Just to save time for both of us the next time, plesae fetch from any of the public tree, find on the first parent chain leading to 'origin/seen' a commit labelled as "Merge branch 'gc/branch-recurse-submodules'", and check out its second parent, and what we have there. $ git checkout "origin/seen^{/^Merge branch .gc/branch-rec}^2" $ git log --first-parent --oneline origin/main.. 35bb9f67f9 branch: add --recurse-submodules option for branch creation ce3a710d42 builtin/branch: clean up action-picking logic in cmd_branch() f368230ca9 branch: add a dry_run parameter to create_branch() d77f8a125b branch: make create_branch() always create a branch f8a88a03b9 branch: move --set-upstream-to behavior to dwim_and_setup_tracking() 47e85beee9 Merge branch 'js/branch-track-inherit' into gc/branch-recurse-submodules If you "rebase -i 47e85beee9" (the exact object name might differ, as that commit needs to be recreated when 'js/branch-track-inherit' is updated) these five commits, and format-patch everything on the topic with --base=47e85beee9, it is guaranteed that I'll be able to cleanly apply what you meant to send out on top of 47e85beee9. Thanks.