From owner-svn-src-all@freebsd.org Sat Aug 4 18:36:24 2018 Return-Path: Delivered-To: svn-src-all@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 B7DC7104F3FD for ; Sat, 4 Aug 2018 18:36:24 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it0-x22b.google.com (mail-it0-x22b.google.com [IPv6:2607:f8b0:4001:c0b::22b]) (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 4C53B82C8C for ; Sat, 4 Aug 2018 18:36:24 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it0-x22b.google.com with SMTP id d9-v6so12531069itf.2 for ; Sat, 04 Aug 2018 11:36:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=m+RFNUQY/lcbZDoWFownm6ei+B6jrmRnRRoWvMeXYbc=; b=iCFX3d0Llx35dKpt9FVyoXJ83LkLRqRadu8nevkED2beo9Z2Ls6xir3d1uj/62yQmt vLTy5whoaXZKLDBLJXvuHpzoFxZP5qQ1eoi11LT9mM5GlQk5MKYg0mve+PEXR7cB7QTV 30RXrJl69dr5FarEjD9qmEkGq2UdwFT1Zqn/Hll5PIctoT3bLHoyt4Lzrz1iKFPc3csC YvcKeH0V1/liXqncXg4ZzxUfAHIOBu2Pu4+z1srHFy1U2gQxOLT7jqwfq21y3UlRrsvg 0jo7yhyQxv+NYratrWLFrYHxqfoReSoUiYUvgqu2t+Klev0lncXxkJDM386O9c24/wqz y/BA== 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=m+RFNUQY/lcbZDoWFownm6ei+B6jrmRnRRoWvMeXYbc=; b=tOUmtI81rrR5zVqRiK1XosdlgxHLi6u1DvYV4XUua2n74WlhZGOWwzFhCbtNofixxJ dHU49lXiX1n7JPHWNVR5MbhXk8Y//GcCGiBUgcfitp3FoC4Ixhg3LpubHUWKCmPiz1kr Wt8DH4Ifkt/tWryUprVMd28u+oKUrnTU4HTwh8UfVz+ol1afgOHG2t1sDt7VneFkH+ZM o06c+h4TMEDtuNvR9//aj+doQSZa3IZW+HATKjX7gZ+UWHdVd0AU/MEs865nzphPld2Q J1ltRLsxAPVsVNwxm7mw8QQ5xmmXYNb9jmDiA/wACUmqkAWhTkziy8W0m/+YPwSrW8FW +qsw== X-Gm-Message-State: AOUpUlEUrTcY8fX4+cVvQS2eGhZd1WViKiXvz0HYQ4lB9jO1aTO3+LYI zdzgLGZT2sAXIpGCBAQlQSXcmTb//Jed1+uqYPiPYJoT4M4= X-Google-Smtp-Source: AAOMgpdBX8F3ZV88V1nNTimYptpdALmelSMtDpQz++0AXvOwQ0oq9HcBw3JQNSG5qD/90kAcLpLjofGW87f1tykbBGM= X-Received: by 2002:a02:bb04:: with SMTP id y4-v6mr7860577jan.5.1533407783541; Sat, 04 Aug 2018 11:36:23 -0700 (PDT) MIME-Version: 1.0 References: <201808021828.w72IS2ts055984@repo.freebsd.org> In-Reply-To: From: Warner Losh Date: Sat, 4 Aug 2018 19:36:11 +0100 Message-ID: Subject: Re: svn commit: r337157 - in head: . tools/tools/git To: Eitan Adler Cc: bwidawsk@freebsd.org, src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.27 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Aug 2018 18:36:25 -0000 On Sat, Aug 4, 2018, 7:11 PM Eitan Adler wrote: > 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. > Oh, that... yes, you may be right. There is another script that it would be wrong in, but not this one... Warner >