From owner-freebsd-current@freebsd.org Thu Dec 24 04:06:33 2020 Return-Path: Delivered-To: freebsd-current@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 7E3CD4B5F79 for ; Thu, 24 Dec 2020 04:06:33 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) (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 4D1c2b5Zh8z4tNR for ; Thu, 24 Dec 2020 04:06:31 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x834.google.com with SMTP id c14so886436qtn.0 for ; Wed, 23 Dec 2020 20:06:31 -0800 (PST) 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=Ppn/ZTx7LwxTNqF7/Yljjdr/pGSm3l/qCewjlPilz/M=; b=jCpdipHvfloN1WxpeolxnxKdyi7tazY2dhTP53nFS7klxyrIQ7LMCPg8YXl2Tkyi/v SmxWtvG5yxiv1sIWa+F3uoXztOSZCDOTAfJqytikzx8nNsqoUUkMcIcnwOnH5umL9J4r JR7sD7zFdz7w+lgfds6RbtCMFlnEN7Tb6xGqi6/aV41Ul67FOsMnfgy/BdfgC0ESvz6G mzBh9I+BGQl46xbmTrLBIIPsGYwRH2527cCmXfzsQ+Mkf+iLGSZggOuseNi4bKQDY69e oCjCYltA9eYjR+0VZipfy24VRl1mAGF6AN71zLH/lYOYm4WKBFiQ3iC+UhiVMcoxdY4K bqQA== X-Gm-Message-State: AOAM530m0/jmIcMGo+9Z9JW5QzWfOBrK/7+HHeI3szE0/bsQ+7lfu8sQ 71IxrX+CVdpUvWEItMwUhUW69cBJcwcE/C3S5KWVVQ== X-Google-Smtp-Source: ABdhPJybSnOPMijYh6WsbFFFpyuDWCACQBMMQjSGJiB8+SaCAJ6+i+ChO1/ymnON3FeepOm2fc6mQjggtP8R810ftGU= X-Received: by 2002:ac8:4910:: with SMTP id e16mr28797243qtq.244.1608782790710; Wed, 23 Dec 2020 20:06:30 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Wed, 23 Dec 2020 21:06:19 -0700 Message-ID: Subject: Re: referencing one commit in another for git To: Jan Beich Cc: Alan Somers , Rick Macklem , FreeBSD Current X-Rspamd-Queue-Id: 4D1c2b5Zh8z4tNR X-Spamd-Bar: -- X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::834:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::834:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::834:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[freebsd-current]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Dec 2020 04:06:33 -0000 On Wed, Dec 23, 2020 at 6:22 PM Jan Beich wrote: > Warner Losh writes: > > > On Wed, Dec 23, 2020, 3:21 PM Alan Somers wrote: > > > >> On Wed, Dec 23, 2020 at 3:16 PM Rick Macklem > wrote: > >> > >> > Hi, > >> > > >> > So I just did my first git commit. Pretty scary, but it looks ok. > >> > > >> > Now, how do I reference one commit in another related > >> > commit's log? > >> > > >> > By the long winded hash or ?? > >> > > >> > I'm not sure if I should ask here or on the git mailing list, > >> > but I figured this isn't a technical git question... > >> > > >> > Thanks for any help with this, rick > >> > > >> > >> Yeah, you should use the full hash. For temporary references, like > during > >> a code review, you can use the first "several" digits of the hash. > For a > >> project of FreeBSD's size, "several" is probably 11-13. But in > permanent > >> contexts, like commit logs, you should use the full hash. When somebody > >> views the commit on a platform like Github, Github will automatically > turn > >> it into a hyperlink, and display only the first "several" digits. > >> > > > > > > For MFCs we are recommending the first 11. I think this will likely > suffice > > and matches the git client behavior. > > Mercurial defaults to 12 digit abbreviation. Git abbreviates linux, > freebsd-legacy, freebsd-ports repos on GitHub to 12 digit. > I've updated to 12. That sounds like a good number of digits...Thanks. Warner