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.2 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, 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 466C51F670 for ; Fri, 22 Oct 2021 13:48:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232938AbhJVNuU (ORCPT ); Fri, 22 Oct 2021 09:50:20 -0400 Received: from elephants.elehost.com ([216.66.27.132]:27819 "EHLO elephants.elehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230342AbhJVNuT (ORCPT ); Fri, 22 Oct 2021 09:50:19 -0400 X-Virus-Scanned: amavisd-new at elehost.com Received: from gnash (cpe00fc8d49d843-cm00fc8d49d840.cpe.net.cable.rogers.com [173.33.197.34]) (authenticated bits=0) by elephants.elehost.com (8.15.2/8.15.2) with ESMTPSA id 19MDljk9049741 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 22 Oct 2021 09:47:46 -0400 (EDT) (envelope-from rsbecker@nexbridge.com) From: "Randall S. Becker" To: "'Junio C Hamano'" , "'brian m. carlson'" Cc: "'Kalyan Sriram'" , References: <0101017ca3e30c39-f111f739-4db7-4c1e-aff2-3ee50f546591-000000@us-west-2.amazonses.com> In-Reply-To: Subject: RE: Git submodule remove Date: Fri, 22 Oct 2021 09:47:39 -0400 Message-ID: <016801d7c74b$64bb9a90$2e32cfb0$@nexbridge.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Mailer: Microsoft Outlook 16.0 Content-Language: en-ca Thread-Index: AQHQ2mH4tSFhsklRMMoBOV3P9H2RGwH+CCNTAU73O8Gr0nhr4A== Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On October 21, 2021 6:47 PM, Junio C Hamano wrote: >To: brian m. carlson >Cc: Kalyan Sriram ; git@vger.kernel.org >Subject: Re: Git submodule remove > >"brian m. carlson" writes: > >> On 2021-10-21 at 17:25:38, Kalyan Sriram wrote: >>> Hello, >>> >>> I was curious why git-submodule does not have an `rm` command. >>> Currently I have to manually delete it from .gitmodules, .git/config, >>> .git/modules/, etc. See [0]. >>> >>> I'd like to contribute my first patch to this project by adding this >>> feature, but wanted to check first with the community if there's any >>> particular reason it was chosen not to not be implemented, or if it's >>> simply that nobody has gotten around to it - it seems to be a >>> relatively common feature someone might want. >>> >>> Anyway, please let me know if this is something that would be >>> accepted, or if anyone has any comments or suggestions. >> >> I think the reason it hasn't been implemented is that nobody's gotten >> around to it yet. I certainly would find this useful and have wanted >> the same thing myself, so I can't see a reason why the right series >> wouldn't be accepted. > >I tend to agree that nobody felt the need strongly enough. Code tends to accumulate without ever getting removed, and removal of a file, >removal of a directory, or removal of a submodule is a much rarer event compared to other changes people would need to make. >Adding such a feature would have been much more work for those who faced such a rare occasion to want to use it than just doing it by >hand and committing the result. > >I'd imagine that the happy-case implementation should be fairly straight-forward. You would: > > - ensure that the submodule is "absorbed" already; > > - run "git rm -f" the submodule to remove the gitlink from the index > and remove the directory from the working tree; and > > - remove the .gitmodules entry for the submodule. > >and you'd leave the final "record the state of the index as a commit" to the user, simply because the user would want to have other >changes related to the removal of the submodule in the same commit (like changes to files in the superproject that refer to the >submodule contents or removal of other submodules). > >The hard part is unhappy-cases. There are too many things that can go wrong and you need to handle all the error cases correctly so that >you do not leave the user's repository in an uncontrollably messy state. Just my rambling: The really unhappy place is when a user deletes the upstream submodule repo itself after not seeing it in main any longer during some cleanup adventure, then someone else tries to check out an older commit that references the submodule. This particular unhappy place seems a whole lot like 'git branch -d' vs '-D', where it might be good not to allow the submodule rm if it is referenced in a commit (insert acceptable criteria for not forcing it here, which probably doesn't exist). A prune-like operation, as with workspace prune might be a little safer - but not much. -Randall