From nobody Mon Jul 24 19:59:46 2023 X-Original-To: freebsd-hackers@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 4R8rbn3r0zz4nh0t for ; Mon, 24 Jul 2023 19:59:49 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu [128.95.76.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "troutmask", Issuer "troutmask" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R8rbm0c8nz4PGb; Mon, 24 Jul 2023 19:59:48 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Authentication-Results: mx1.freebsd.org; dkim=none; spf=none (mx1.freebsd.org: domain of sgk@troutmask.apl.washington.edu has no SPF policy when checking 128.95.76.21) smtp.mailfrom=sgk@troutmask.apl.washington.edu; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=washington.edu (policy=none) Received: from troutmask.apl.washington.edu (localhost [127.0.0.1]) by troutmask.apl.washington.edu (8.17.1/8.17.1) with ESMTPS id 36OJxkQY097786 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 24 Jul 2023 12:59:46 -0700 (PDT) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.17.1/8.17.1/Submit) id 36OJxkU2097785; Mon, 24 Jul 2023 12:59:46 -0700 (PDT) (envelope-from sgk) Date: Mon, 24 Jul 2023 12:59:46 -0700 From: Steve Kargl To: Brooks Davis Cc: freebsd-hackers@freebsd.org Subject: Re: how to compare branches? Message-ID: Reply-To: sgk@troutmask.apl.washington.edu References: List-Id: Technical discussions relating to FreeBSD List-Archive: https://lists.freebsd.org/archives/freebsd-hackers List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-hackers@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spamd-Result: default: False [-2.00 / 15.00]; SUBJECT_ENDS_QUESTION(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.998]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[washington.edu : No valid SPF, No valid DKIM,none]; ASN(0.00)[asn:73, ipnet:128.95.0.0/16, country:US]; MLMMJ_DEST(0.00)[freebsd-hackers@freebsd.org]; R_DKIM_NA(0.00)[]; R_SPF_NA(0.00)[no SPF record]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; RCVD_TLS_LAST(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; TO_DN_SOME(0.00)[]; REPLYTO_ADDR_EQ_FROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; HAS_REPLYTO(0.00)[sgk@troutmask.apl.washington.edu] X-Rspamd-Queue-Id: 4R8rbm0c8nz4PGb X-Spamd-Bar: - On Mon, Jul 24, 2023 at 12:52:12PM -0700, Steve Kargl wrote: > On Mon, Jul 24, 2023 at 07:43:30PM +0000, Brooks Davis wrote: > > On Mon, Jul 24, 2023 at 12:37:37PM -0700, Steve Kargl wrote: > > > It has been brought to my attention that a few fixes to libm > > > in main have not been merged to at least the 13 branch. To > > > check on the level of missing changes, I would to compare ther > > > lib/msun on main to lib/msun on stable/13. What is the git > > > command needed for such a task? My attempts of modifying results > > > from a google search of "git diff between branches" has been > > > entertaining but fruitless. > > > > git diff stable/13..main lib/msun > > > > or you can see individual commits graphically on mfc.freebsd.org with > > the filter @lib/msun/ > > > > Thanks! The command you showed is the one variation I didn't try. > Hmmm, I must be missing something. > > % cd /usr/src > % git diff stable/13..main lib/msun > fatal: ambiguous argument 'stable/13..main': unknown revision or path > not in the working tree. > Use '--' to separate paths from revisions, like this: > 'git [...] -- [...]' > % git status > On branch main > Your branch is up to date with 'freebsd/main' > So, it seems I used the info from https://docs.freebsd.org/en/books/handbook/mirrors/#git to clone freebsd. I need to include the freebsd/ in the command. This works % git diff freebsd/stable/13..freebsd/main -- lib/msun -- Steve