From owner-freebsd-git@freebsd.org Wed Jun 17 13:36:37 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7525134F4B5 for ; Wed, 17 Jun 2020 13:36:37 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f46.google.com (mail-io1-f46.google.com [209.85.166.46]) (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 49n5h44qmwz3Ycx for ; Wed, 17 Jun 2020 13:36:36 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f46.google.com with SMTP id u13so2693920iol.10 for ; Wed, 17 Jun 2020 06:36:36 -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; bh=1zIfv9c1+YpPDLiajOHZ0i69AYsM9XGmL3rrOzOcnrY=; b=RKMljWFATXw7Q4pDy4l9mlUsY5wIo2BAhf5erNqyIzqaamk5y9YVjsCgRPYudNefg0 dRjAsofHmbbxE9yVcLy5pgt5pOpS4JmhIrxPbwzJS1Zk4+CmwZQveqjI2fmnI8r7he/g dJIb+YAGm/ZXxM2+QZ1CEDmxCLV96Lym3lkvPs9GUUQt2NnkwFZqHy4QU8UJa0D2hhco ATYmuXNWFMr2bmjwYx8dDn5TUj4A6hvZXH+B9/Qrc4H8dh8kZI68lxTe1St8LrVmjz9z 822L6pcWeZIuDdWe47rN2Dj5UOKd93wUZZMuhkTjkSsm3SaPfdMgsMs3j7ou58XyECQv EUng== X-Gm-Message-State: AOAM533wLKbrLVVgdkCRBRAzS5Hyo1wraZjH3qpS9VooXYNoYuLWf9mZ dh9eyN8Onfp19Ajn3SvUnWIMPswczvseJRJA/M6Dw6xz X-Google-Smtp-Source: ABdhPJy/6scP8p538mqPqbL9yIzPcj4QkEc09KoAgObGFKb920lzBFyuAfNHybfqNvxBwVsGHYhoiF9zP0S6H8qKyLk= X-Received: by 2002:a02:ce8a:: with SMTP id y10mr31522977jaq.136.1592400994498; Wed, 17 Jun 2020 06:36:34 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Wed, 17 Jun 2020 09:36:21 -0400 Message-ID: Subject: Re: Next odd commit affecting `git subtree split` experiments with contrib/elftoolchain To: freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 49n5h44qmwz3Ycx 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.46 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [0.65 / 15.00]; ARC_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_TLS_ALL(0.00)[]; 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]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; TO_DN_NONE(0.00)[]; NEURAL_SPAM_MEDIUM(0.84)[0.836]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-0.61)[-0.607]; DMARC_NA(0.00)[freebsd.org]; NEURAL_SPAM_SHORT(0.42)[0.421]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.46:from]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.46:from]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; TO_DOM_EQ_FROM_DOM(0.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jun 2020 13:36:37 -0000 On Tue, 16 Jun 2020 at 22:25, Ed Maste wrote: > > I've now successfully used Tom Clarkson's patched git subtree[1] to > split elftoolchain out of cgit-beta, keeping the vendor branch history > intact, and avoiding the extraneous and bogus commits. I've done a cursory comparison of the history in this converted + split repo against contrib/elftoolchain in svn, and it is broadly as expected. There are some commits that are shown only in the git conversion, and some that appear only in svn. The git history includes the vendor branch commits, which do not appear in svn log of the subdirectory. `git log --graph` makes the relationship between the various branches clear. Subversion history includes a number of commits that affect mergeinfo only, such as r353358[1]. These are completely absent in the git conversion. As expected, the contents of the files in the git conversion and of contrib/elftoolchain are identical. [1] https://svnweb.freebsd.org/base?limit_changes=0&view=revision&revision=353358