From owner-svn-src-head@freebsd.org Sat Aug 4 18:11:08 2018 Return-Path: Delivered-To: svn-src-head@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 25F95104E939 for ; Sat, 4 Aug 2018 18:11:08 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-yb0-x234.google.com (mail-yb0-x234.google.com [IPv6:2607:f8b0:4002:c09::234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 96AE3821D5 for ; Sat, 4 Aug 2018 18:11:07 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: by mail-yb0-x234.google.com with SMTP id e9-v6so3871181ybq.1 for ; Sat, 04 Aug 2018 11:11:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=jpHp8ao4+Wkj/CwsaiMQaDs9bNjMxY/z3alE1UdgOi0=; b=BqjeQoifpNo/2fHGfA/XWptPik2m5kzWd2DS1hlQtBOX+phqy2di8A+UNvNDSEYCru NC3iESPDsOz4k2pKTx+Rr+o3DFVPx/3udcL/j1rYQEZEnv4c6PSwkKZVQfWvI9+jwolb 9TJg/qOntpKXr3bSCzuLiRlTEzyrWt2+ZnJGU= 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=jpHp8ao4+Wkj/CwsaiMQaDs9bNjMxY/z3alE1UdgOi0=; b=RjyXLOjk9wn9mDUr+yF0+g08EKtTzB1f6Yt9n7plpkDUCtayy5mIBEmNiKxhN3JA+8 6uX/RFZkWyijfq41QECdty0rfpHKO3+X3R/p98dUFv1e9JRSyLHFSWEPu13w7lwfAaVF NoQVC2PUTSCw+yKNkSCV81eFOaU61Gwjfyu28AuuTYHsV79lUgXMjdovet/FuDXuwWNB Ut1ytPCzQcN8hh2qYwBPo0sMG51lRuOC7bZwkLuXcJblMJF3fukvFYp0ZKzB7BQNBPJ9 nuhxhWOG1YjeLHoDg12uQKvA+wxskq4VRzAOcoYoJpsM4Ma/T2JlrQiDzXNkHIlbZhkU K0OA== X-Gm-Message-State: AOUpUlGoRsf1/ILI7Wr1CQImCFcL9paGcqexTXS0fCPsvEEFL/rBXVlO vsj0cB/nMQ865aT0uyXXzOtW4LkIJU1Ew8/NJ956cg== X-Google-Smtp-Source: AAOMgpcJYVteO+FAoBtjQ/9f/rnrIkj7mFwvFf5Jbq+97YzoNxhoHHoe0HYWI/uxLGM0nKQC4SLLi0DAdHREJ8mfPIY= X-Received: by 2002:a25:ba8b:: with SMTP id s11-v6mr4655408ybg.87.1533406266678; Sat, 04 Aug 2018 11:11:06 -0700 (PDT) MIME-Version: 1.0 References: <201808021828.w72IS2ts055984@repo.freebsd.org> In-Reply-To: From: Eitan Adler Date: Sat, 4 Aug 2018 11:10:39 -0700 Message-ID: Subject: Re: svn commit: r337157 - in head: . tools/tools/git To: Warner Losh Cc: bwidawsk@freebsd.org, src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Aug 2018 18:11:08 -0000 On Sat, 4 Aug 2018 at 10:16, Warner Losh wrote: > > > > On Sat, Aug 4, 2018, 6:08 PM Eitan Adler wrote: >> >> On Thu, 2 Aug 2018 at 11:28, Ben Widawsky wrote: >> > +git_checkout() >> > +{ >> > + # Delete master >> > + ${GIT} branch -D master >> > + >> > + # Make master really be trunk >> > + ${GIT} checkout -b master trunk >> >> Can't this be git branch --force master trunk ? > > > No. That won't work. We do not want to change the location of master. This will reset it to trunk, which is nearly always wrong. See this: ${GIT} branch -D master ${GIT} checkout -b master trunk For clarity I'd expect something closer to: git branch --force master trunk git checkout master The end result is the same, but IMHO this is clearer in intent. -- Eitan Adler