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.1 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI,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 134CF1F5AE for ; Wed, 16 Jun 2021 01:03:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230376AbhFPBF5 (ORCPT ); Tue, 15 Jun 2021 21:05:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229979AbhFPBF4 (ORCPT ); Tue, 15 Jun 2021 21:05:56 -0400 Received: from mail-io1-xd2c.google.com (mail-io1-xd2c.google.com [IPv6:2607:f8b0:4864:20::d2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC63FC061574 for ; Tue, 15 Jun 2021 18:03:51 -0700 (PDT) Received: by mail-io1-xd2c.google.com with SMTP id q3so1174571iop.11 for ; Tue, 15 Jun 2021 18:03:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rosekunkel-me.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=tj/MY84O0BrEs0S/8bdOKiU0E9+isM2++THNjWdBBGo=; b=rJKGfBgAxRZclYALbA4t8dudNXqVt9Z+IA3dFONs6JBgOKyuVrpz9V3GewoWblDh1m vN475pRfeSBMXEGYur+lh83DSua99BDhbjGAR4OL/vNWR5DdBNZpKq1v0wuYwN4EZBtC V1OLGvYsic7temqUeWlazIzAi1XPJEW8OzrweL7qBT66feVUz6DNgYhrDFm/JoznKNoX 3gvfshoDV6BuXuQDsO5Nsc0Y7jL9kDHV5Q/6adUAS4HxHemPUDzXGLPL8kvscgTiwXQ3 gS5w9FcaObpKwPJZCQdgeRr0uDtFIXE5a0pwJY7xq7TsLYvN2MSr81lrK67iNimjY3K3 iwmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=tj/MY84O0BrEs0S/8bdOKiU0E9+isM2++THNjWdBBGo=; b=ZYrNG5w9BKmOPDqmO4wzr2yny9gfZhxA4iRhN28zaIMp7bNuN220pnqQRn9lfGR3Db l01CBacbDawVL9LCKF4u2wayvU/5SOkOkqXY6EC8KSrczAgIjr+8YZ2CMe/SLhByemGx f7sLkBUvJfHlLvGohlsxhMgnPkU/4F/0YlKjlplHcvUnjIpjk0u9X7xeJK9Ftyv3Efhy J4N2y48PSvU+k5hR3fSQ+i16TukPAUI4zKqcuacxLqU7ea3oq5H15rGDEZqdA5sZzZ2l ILMwePYIyGpcB4hXaXuQhIx6gB8FdKebKQSmsxN8yDX4q6yVjZ160CaBPnF/2/qI2oag 4kWA== X-Gm-Message-State: AOAM532yRMMayzexougjIzw+6CoJey+SviYQ5DiSqDnwpRZcZtSkyMMM VzfCA91/SXbJMVBUQ8vc08SYeLqCAdIZgqMBraWqqA== X-Google-Smtp-Source: ABdhPJy/KId5P4OV2iK62q6EYCNyn7iELapdQHLUhXeU2Bp/Sdxx+yTyMr71qNBqYK+gbXuGB0qh57O+XTKPcD49DfU= X-Received: by 2002:a02:956a:: with SMTP id y97mr1715588jah.58.1623805431247; Tue, 15 Jun 2021 18:03:51 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Rose Kunkel Date: Tue, 15 Jun 2021 18:03:40 -0700 Message-ID: Subject: Re: [BUG] `git reset --hard` fails with `update = none` submodules To: "brian m. carlson" , Rose Kunkel , git@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Potentially relevant: `git config --global --list` shows ``` status.showstash=true status.submodulesummary=true submodule.recurse=true user.name=Rose Kunkel user.email=rose@rosekunkel.me pull.rebase=false init.defaultbranch=main ``` On Tue, Jun 15, 2021 at 5:57 PM Rose Kunkel wrote: > > Running `git status` in the resulting repository gives > ``` > On branch master > Your branch is up to date with 'origin/master'. > > nothing to commit, working tree clean > ``` > > This is the output from the clone command: > ``` > Cloning into 'tree-sitter-langs'... > remote: Enumerating objects: 609, done. > remote: Counting objects: 100% (83/83), done. > remote: Compressing objects: 100% (52/52), done. > remote: Total 609 (delta 40), reused 58 (delta 24), pack-reused 526 > Receiving objects: 100% (609/609), 117.17 KiB | 1.05 MiB/s, done. > Resolving deltas: 100% (322/322), done. > Submodule 'repos/agda' > (https://github.com/tree-sitter/tree-sitter-agda) registered for path > 'repos/agda' > Submodule 'repos/bash' > (https://github.com/tree-sitter/tree-sitter-bash) registered for path > 'repos/bash' > Submodule 'repos/c' (https://github.com/tree-sitter/tree-sitter-c) > registered for path 'repos/c' > Submodule 'repos/c-sharp' > (https://github.com/tree-sitter/tree-sitter-c-sharp) registered for > path 'repos/c-sharp' > Submodule 'repos/cpp' (https://github.com/tree-sitter/tree-sitter-cpp) > registered for path 'repos/cpp' > Submodule 'repos/css' (https://github.com/tree-sitter/tree-sitter-css) > registered for path 'repos/css' > Submodule 'repos/elm' (https://github.com/razzeee/tree-sitter-elm) > registered for path 'repos/elm' > Submodule 'repos/fluent' > (https://github.com/tree-sitter/tree-sitter-fluent) registered for > path 'repos/fluent' > Submodule 'repos/go' (https://github.com/tree-sitter/tree-sitter-go) > registered for path 'repos/go' > Submodule 'repos/html' > (https://github.com/tree-sitter/tree-sitter-html) registered for path > 'repos/html' > Submodule 'repos/janet-simple' > (https://codeberg.org/sogaiu/tree-sitter-janet-simple) registered for > path 'repos/janet-simple' > Submodule 'repos/java' > (https://github.com/tree-sitter/tree-sitter-java) registered for path > 'repos/java' > Submodule 'repos/javascript' > (https://github.com/tree-sitter/tree-sitter-javascript) registered for > path 'repos/javascript' > Submodule 'repos/jsdoc' > (https://github.com/tree-sitter/tree-sitter-jsdoc) registered for path > 'repos/jsdoc' > Submodule 'repos/json' > (https://github.com/tree-sitter/tree-sitter-json) registered for path > 'repos/json' > Submodule 'repos/julia' > (https://github.com/tree-sitter/tree-sitter-julia) registered for path > 'repos/julia' > Submodule 'repos/ocaml' > (https://github.com/tree-sitter/tree-sitter-ocaml) registered for path > 'repos/ocaml' > Submodule 'repos/php' (https://github.com/tree-sitter/tree-sitter-php) > registered for path 'repos/php' > Submodule 'repos/python' > (https://github.com/tree-sitter/tree-sitter-python) registered for > path 'repos/python' > Submodule 'repos/ruby' > (https://github.com/tree-sitter/tree-sitter-ruby) registered for path > 'repos/ruby' > Submodule 'repos/rust' > (https://github.com/tree-sitter/tree-sitter-rust) registered for path > 'repos/rust' > Submodule 'repos/scala' > (https://github.com/tree-sitter/tree-sitter-scala) registered for path > 'repos/scala' > Submodule 'repos/swift' > (https://github.com/tree-sitter/tree-sitter-swift) registered for path > 'repos/swift' > Submodule 'repos/typescript' > (https://github.com/tree-sitter/tree-sitter-typescript) registered for > path 'repos/typescript' > Skipping submodule 'repos/agda' > Skipping submodule 'repos/bash' > Skipping submodule 'repos/c' > Skipping submodule 'repos/c-sharp' > Skipping submodule 'repos/cpp' > Skipping submodule 'repos/css' > Skipping submodule 'repos/elm' > Skipping submodule 'repos/fluent' > Skipping submodule 'repos/go' > Skipping submodule 'repos/html' > Skipping submodule 'repos/janet-simple' > Skipping submodule 'repos/java' > Skipping submodule 'repos/javascript' > Skipping submodule 'repos/jsdoc' > Skipping submodule 'repos/json' > Skipping submodule 'repos/julia' > Skipping submodule 'repos/ocaml' > Skipping submodule 'repos/php' > Skipping submodule 'repos/python' > Skipping submodule 'repos/ruby' > Skipping submodule 'repos/rust' > Skipping submodule 'repos/scala' > Skipping submodule 'repos/swift' > Skipping submodule 'repos/typescript' > ``` > > On Tue, Jun 15, 2021 at 5:51 PM brian m. carlson > wrote: > > > > On 2021-06-16 at 00:16:06, Rose Kunkel wrote: > > > # What did you do before the bug happened? (Steps to reproduce your issue) > > > 1. Clone a git repository that sets `update = none` in .gitmodules: > > > $ git clone --recurse-submodules https://github.com/ubolonton/tree-sitter-langs > > > > > > 2. Perform a hard reset: > > > $ cd tree-sitter-langs > > > $ git reset --hard > > > > > > # What did you expect to happen? (Expected behavior) > > > The reset should succeed and do nothing. > > > > I think we're in agreement on this. This should be a fresh clone and so > > a hard reset should change nothing. > > > > > # What happened instead? (Actual behavior) > > > The reset command fails with > > > ``` > > > fatal: not a git repository: ../../.git/modules/repos/agda > > > fatal: could not reset submodule index > > > ``` > > > > Hmmm, I can't reproduce this behavior. What I see is this: > > > > $ git reset --hard > > HEAD is now at 5d362ce Release 0.10.0 > > > > I'm running git version 2.32.0.272.g935e593368 on Debian sid (with the > > experimental packages). > > > > Can you try the clone and run a "git status" command in the repository > > to see if anything is modified after your clone? Are the submodules > > checked out when you perform the clone? In my case, I see lines like > > this: > > > > Skipping submodule 'repos/agda' > > > > If you're seeing something different, then that might contribute to the > > different behavior we're seeing. > > -- > > brian m. carlson (he/him or they/them) > > Toronto, Ontario, CA