From owner-freebsd-git@freebsd.org Tue May 28 18:55:51 2019 Return-Path: Delivered-To: freebsd-git@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A1B1715A8A3D for ; Tue, 28 May 2019 18:55:51 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) 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 CD7C88CD18 for ; Tue, 28 May 2019 18:55:50 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f67.google.com with SMTP id e3so5134425ioc.12 for ; Tue, 28 May 2019 11:55:50 -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:content-transfer-encoding; bh=gNJF6T4H8mgVd7oXyrqUpAbEamyCba02vMf+TtdqRzI=; b=RbXHedWhm9yNrQW8jgB+uZ0qSn7T1Lx+Sx/q1ThmvaUfN/NtHsO6KmyHpUvCWqL9yh tkifEVEnERDeEUFAChJTD782VVIk+Ht/oDev3dlBclPk5psX+Ry1Ltw8Y8K8cLzAXN1K gEsdXQoZdDYa1FaxfV8Xlqts+2SWz4oYPZyViJsYfbESD4eoI7aEqAP7JiyfxCbTfpCV zGxDyBPP0ELBcGsEkLqpzthS8Isirqie3yed2VqBZBr3VmMhKKZBJ/2Awzcr9MiSlZ6y KPoiunrvhJzIWBNRuHbYraqqIzjjLRHzDaRuu5vtaaV1JK/vtu91M50HjTjOeLRWpcW5 LPpQ== X-Gm-Message-State: APjAAAVpt86dBqLXf/Rq8neTuKlxKGjtKUt5iBVLQjrHjUxyGAgoRRPL x/n6KJosKXxlsvHK85oSdNhbDWLQMdRToNzYxpg= X-Google-Smtp-Source: APXvYqx3XHo8qVscgeUZBcjgQ6lFSSTY6C0fMLfGAcnhVfAqrfWkym6kODs0hBN4zGRx0CLU3NJPUa5XuJcjzqWBt9A= X-Received: by 2002:a6b:b497:: with SMTP id d145mr5828295iof.17.1559069264986; Tue, 28 May 2019 11:47:44 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Tue, 28 May 2019 08:18:28 -0400 Message-ID: Subject: Re: Speeding up slower Git operations To: Ilya Bakulin Cc: freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: CD7C88CD18 X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.166.67 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-3.92 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[67.166.85.209.list.dnswl.org : 127.0.5.0]; NEURAL_HAM_SHORT(-0.76)[-0.760,0]; RCVD_TLS_LAST(0.00)[]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; IP_SCORE(-1.15)[ipnet: 209.85.128.0/17(-3.38), asn: 15169(-2.29), country: US(-0.06)]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.29 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: Tue, 28 May 2019 18:55:51 -0000 On Tue, 28 May 2019 at 13:57, Ilya Bakulin wrote: > > You are counting commits behind HEAD which is a mere pointer to the curre= nt branch head. So if you are working on some "topic" branch then the numbe= r becomes effectively useless since it will count a number of commits behin= d that topic branch HEAD. So this number alone is not sufficient unless you= also append "-dirty" or something else to denote the "canonical" build don= e from a clean git checkout of the official FreeBSD repository. Which is a = good idea anyway, I guess. Correct. For builds of an unmodified upstream version the (branch, rev-list --count) will be unique and consistent. Today for builds from git we include in uname the corresponding SVN version, the git hash, and the branch - e.g. a test machine here reports "r333291+95e9f145d658(HEAD-TESTING)". I'm not sure what the best way to report it would be, but in the absence of svn we could indicate something like "95e9f145d658(HEAD-TESTING) c251421". > So that when somebody reports a bug on some mailing list and includes a k= ernel version number (or freebsd-version output) it's immediately obvious t= hat they are using a non-official kernel. We do that today as well, appending -dirty for builds from a modified git tree and M from a modified Subversion tree.