From nobody Mon Jun 14 15:38:58 2021 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id ED82711DA5E7 for ; Mon, 14 Jun 2021 15:39:52 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f169.google.com (mail-il1-f169.google.com [209.85.166.169]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G3bHD094Gz3PvX; Mon, 14 Jun 2021 15:39:51 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f169.google.com with SMTP id x18so12579527ila.10; Mon, 14 Jun 2021 08:39:51 -0700 (PDT) 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:cc; bh=hloA4W7WjR0E5WIY6PVV+NW0fA7w3jlhHJYRXNAQ6Co=; b=tndg7k2NbgnAdr9RTKBtMfQfOnJKLFugbiLTeHiqvxopf/uOv0ACt5euEDkWg1GbOd PH8pQ6kbLJ8aDoZ868LQNmOFzWGbM904nuBbXLUQ3SevHy1h64BGinuc9MREcr3yYkVO 9/opJTY8B4gef0w4y56PN4AxCB1nej9zCTMXka0xeYw3yUAtDTISrwD79jAXqZ3uOTuy 00Qpgbnh2Gv7R5udvvd0QLMSO3RnWtI0UpZUTp9fr/eNpYfT9bOBxljLb49CEqYvv3Rg QmslRdwsRwr8LffM7uqShyTrK1dykmIdQKxaeAZHdNH5CVO1uGibEXBcer0QQd473p3F aX6A== X-Gm-Message-State: AOAM530JOg1cQwoFRAxNmwDf3BeK6/vfFpXgPirNBwAdFuKLwOYxxRu4 ahMz6TK2L3JzFZvzRZrrxDN4/qIWgPxwsWiKWJSIPmm6gzI= X-Google-Smtp-Source: ABdhPJx3Su5IJi1N/Y9U75/W0H5h6ZC5DWzx0a0fvy2LUx/am5ySRbolk8zhqb/hWkcGyEgsyb/z1HnlNz0SitaSGOM= X-Received: by 2002:a92:660f:: with SMTP id a15mr15566680ilc.182.1623685190436; Mon, 14 Jun 2021 08:39:50 -0700 (PDT) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: <202106081453.158Eri7k025234@gitrepo.freebsd.org> In-Reply-To: <202106081453.158Eri7k025234@gitrepo.freebsd.org> From: Ed Maste Date: Mon, 14 Jun 2021 11:38:58 -0400 Message-ID: Subject: Git submodules in OpenZFS To: freebsd-git Cc: Martin Matuska Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4G3bHD094Gz3PvX X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.166.169 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-1.09 / 15.00]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.166.169:from]; RCVD_COUNT_TWO(0.00)[2]; FREEFALL_USER(0.00)[carpeddiem]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_TLS_ALL(0.00)[]; SPAMHAUS_ZRD(0.00)[209.85.166.169:from:127.0.2.255]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; TO_DN_ALL(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.169:from]; NEURAL_SPAM_SHORT(0.91)[0.913]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.169:from]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; MIME_TRACE(0.00)[0:+]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; MAILMAN_DEST(0.00)[freebsd-git] X-ThisMailContainsUnwantedMimeParts: N On Tue, 8 Jun 2021 at 10:53, Martin Matuska wrote: > > The branch main has been updated by mm: > > URL: https://cgit.FreeBSD.org/src/commit/?id=1603881667360c015f6685131f2f25474fa67a72 > > commit 1603881667360c015f6685131f2f25474fa67a72 > Merge: ed9215c8e05f 75b4cbf62590 > Author: Martin Matuska > AuthorDate: 2021-06-08 14:48:37 +0000 > Commit: Martin Matuska > CommitDate: 2021-06-08 14:52:44 +0000 > > zfs: merge openzfs/zfs@75b4cbf62 (master) into main It turns out this has the side-effect of introducing submodule use, in sys/contrib/openzfs/scripts/zfs-images. We can mostly ignore this for FreeBSD, but it can introduce an issue for downstream projects that intend to use submodules for some portion of their tree. I encountered this because I have a WIP tree that incorporates pkg and drm-kmod via submodules, and updating it produced the error: fatal: No url found for submodule path 'sys/contrib/openzfs/scripts/zfs-images' in .gitmodules There are a few different ways I think we could address this. Assuming we don't need to use zfs-images in FreeBSD I believe the easiest will be to just delete the directory/submodule in FreeBSD, e.g. `git rm sys/contrib/openzfs/scripts/zfs-images`.