From owner-freebsd-git@freebsd.org Thu Jun 25 20:05:49 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 2D729344228 for ; Thu, 25 Jun 2020 20:05:49 +0000 (UTC) (envelope-from r@robakdesign.com) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (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 49t9xQ5YYzz4XKM for ; Thu, 25 Jun 2020 20:05:46 +0000 (UTC) (envelope-from r@robakdesign.com) Received: by mail-wr1-f45.google.com with SMTP id j4so4699726wrp.10 for ; Thu, 25 Jun 2020 13:05:46 -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:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=36Qx0C2Hi0K+B2/WFdaeJg+5DDV8GnKD+c6zx24QJT4=; b=n+X3qGzGXbyj7AtlItLEdHqdXGGGHbuVObIdpC0UWlCzgZ57UPIsf9sySouTPGKe+q L6uKiHKSbtNljMHDxHLJ33k4yfpsC3FsXvnAfsE31BqkBHRmUD+ScGsLxsINtzguCQt5 VfeZlDM6rFBo+DUKuViDmNvoH+cQsqJ2dfJHTMR35KddSd3UcDDXhDw6lNuXj2l6K0L/ oX8sFJQxx8gXCQlX0qaLYM3j46U0sQ+lfScdPK0y87ad61DRSdvy1lBl0FVoEKqVfG1f 4GRtle29K3TT9c5dHc01LTtS4PX2Wege9GIieQvHLHRJzVsBLbwekyEUmcMdojbNGSIw cY7g== X-Gm-Message-State: AOAM530u4DF58YyMwSpIMLbKf8qFiVl3uKQk5dV9SF6mXEqVmMDb0Sxn mK87lbkILkjRqTgqQeo0D8qHLc7p5vA= X-Google-Smtp-Source: ABdhPJw1FP+sgQrt5Ey434cHf8QqGVeAramKCYFZxsIhJUmPAdBriRzWHXmsUwszO36uejASWXl1Kw== X-Received: by 2002:a5d:6a46:: with SMTP id t6mr11905044wrw.374.1593115544994; Thu, 25 Jun 2020 13:05:44 -0700 (PDT) Received: from [192.168.168.186] (102.235.6.51.dyn.plus.net. [51.6.235.102]) by smtp.gmail.com with ESMTPSA id v5sm13631282wre.87.2020.06.25.13.05.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jun 2020 13:05:44 -0700 (PDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.80.23.2.2\)) Subject: Re: svn primer translation to git From: =?utf-8?Q?Bart=C5=82omiej_Rutkowski?= In-Reply-To: Date: Thu, 25 Jun 2020 21:05:43 +0100 Cc: Mitchell Horne , freebsd-git@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <61D3797D-88AD-4005-9DB7-E08B207D666D@FreeBSD.org> References: <5b1b2132-d3ed-96b6-1e48-18c3ea515970@FreeBSD.org> To: Ed Maste X-Mailer: Apple Mail (2.3608.80.23.2.2) X-Rspamd-Queue-Id: 49t9xQ5YYzz4XKM X-Spamd-Bar: + Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of r@robakdesign.com has no SPF policy when checking 209.85.221.45) smtp.mailfrom=r@robakdesign.com X-Spamd-Result: default: False [1.79 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; RCVD_COUNT_THREE(0.00)[3]; FORGED_SENDER(0.30)[robak@FreeBSD.org,r@robakdesign.com]; RECEIVED_SPAMHAUS_PBL(0.00)[51.6.235.102:received]; MIME_TRACE(0.00)[0:+]; R_MIXED_CHARSET(0.62)[subject]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; MID_RHS_MATCH_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[robak@FreeBSD.org,r@robakdesign.com]; R_DKIM_NA(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.70)[-0.695]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_SPAM_SHORT(0.25)[0.246]; NEURAL_HAM_LONG(-0.08)[-0.084]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[FreeBSD.org]; AUTH_NA(1.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.221.45:from]; R_SPF_NA(0.00)[no SPF record]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.221.45:from]; RCVD_TLS_ALL(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: Thu, 25 Jun 2020 20:05:49 -0000 > On 25 Jun 2020, at 21:02, Ed Maste wrote: >=20 > On Thu, 25 Jun 2020 at 09:48, Mitchell Horne = wrote: >>=20 >> We should advise users to set pull.rebase in their configuration, >> either globally in ~/.gitconfig or on the repository-level in >> .git/config. It seems that newer versions of git will print a warning >> if neither pull.ff or pull.rebase is set. It's unfortunate that we >> can't include config files as part of the repository, so this will >> always need to be done manually. >=20 > I agree it's unfortunate we can't set repository-level defaults that > come along with the initial clone. We could have a script though that > users can run to display or adjust the appropriate settings, perhaps. > Our standard quickstart instructions could be something like >=20 > % git clone foo@cgit-beta.freebsd.org/src.git > % cd src > % sh tools/git-repo-init.sh Why can't we ship the gitconfig file inside of the repository containing = the defaults we'd like to be used? Kind regards, Bartek Rutkowski