From owner-svn-src-all@freebsd.org Sat Aug 4 17:16:38 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 829D6104C461 for ; Sat, 4 Aug 2018 17:16:38 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it0-x234.google.com (mail-it0-x234.google.com [IPv6:2607:f8b0:4001:c0b::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 1141980913 for ; Sat, 4 Aug 2018 17:16:38 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it0-x234.google.com with SMTP id v71-v6so12792363itb.3 for ; Sat, 04 Aug 2018 10:16:38 -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=lzbHZWNkwGt49UPylYxtzRz9fRyYCQtGM1AW6WV6X4E=; b=pClwFW3YRRLZmV3tIdo8MAFfjhGwxyOT5yGjnPrD0kwHQ1605bGOpLEqXsXblh+31S x3cq4e8h7gF5yEpSQRxF0FkO8yTfAYqMUoxn31Fs4Vv3KidOVj6YgMN5AP3c+GUT4l3C IjdVXurH4dvqP0wCVCgzWELUiUzIcyjjd/fyf98Tg/x75GNUqVaz4ZzgEEhbLwfGfhxS cvxH7avJPtJFsL/3NcpN2zz9BO1ROrR8GwQLlACqH6hc/YyaGOth5g9Kmt//NcYfFG13 dvBmk7q7oehHMJCglN+1HHLnsxpkQbczUazRZuSA6dkGFFEiK5LmJCatWjoiwcJQcWtd VSCg== 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=lzbHZWNkwGt49UPylYxtzRz9fRyYCQtGM1AW6WV6X4E=; b=g4Trw6k9VRge+MB3ZrWY7O7Ziozs3Z5wyr1oR4Ngor08PWKWbrEm2dPx2QJcyS2YMy WAauubjOhhUqxn5h77fANHcn+djQgM3kxJUZXosrBtnh7DyEQXf4mXXTGlQJ2uOwL2mN rnwrFXhDt9j/07Foggb3glVHs1I1GsMFo7h5wwJk400MyR5AXU+JkfKD9Z7AnURhzg2l 5Ef23lSEr1W9SwOVVyYhlOL2Ge/T+d0QTtrcpPVq6gv7dEcuxkUve9HWuQp9NhFVvP/y CNUYei65FcAaKMf8ISNKW555vrmY0r/BFBgG5JtaGjD/AdTWnadFr2eJcQBR4yIAYqMY XB/A== X-Gm-Message-State: AOUpUlHUzOOQ56N+rWOA+Y4or2ZiH/aYUUhMG8ChSGh6KFA4yId0g11U 0KMavOwADotYGKMnT8yN3u5XhMNBWwBLNP/kwdSCyQ== X-Google-Smtp-Source: AAOMgpdkHo5B97Xz9M8aINbspVJ3Fy09F3pNlu2zAeUaiOarcltHG2SKJ3XuL2Vz7IIWbvINksnqbme0q5ApZaLZ9pY= X-Received: by 2002:a24:b211:: with SMTP id u17-v6mr10009809ite.1.1533402997336; Sat, 04 Aug 2018 10:16:37 -0700 (PDT) MIME-Version: 1.0 References: <201808021828.w72IS2ts055984@repo.freebsd.org> In-Reply-To: From: Warner Losh Date: Sat, 4 Aug 2018 18:16:24 +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 17:16:38 -0000 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. Warner >