From owner-freebsd-git@freebsd.org Sat May 1 19:36:53 2021 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 C974D635C80 for ; Sat, 1 May 2021 19:36:53 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4FXfd13Y38z4qQd for ; Sat, 1 May 2021 19:36:53 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id 7952763567F; Sat, 1 May 2021 19:36:53 +0000 (UTC) Delivered-To: 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 79163635C05 for ; Sat, 1 May 2021 19:36:53 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d]) (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 4FXfd12rxDz4qcg for ; Sat, 1 May 2021 19:36:53 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x82d.google.com with SMTP id f12so1017638qtf.2 for ; Sat, 01 May 2021 12:36:53 -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=tG2m9Eb/QpED6xZH5RNRbXGjt7iUmwaJQZ3O+bJSjik=; b=aHLECwLsuvbTId3se66a+CsBlew+B7tP6EI+AUMPnYbjrswZyxtYsIB6qRd9qq6Dm/ oCg8rTEfor0x8HmA9GMHYBPRL44Fks8RL4uVzIQyCj121/Iz7na3pOZt0s9RYygA/heH HyghTmrKI/2PsB0Bv/fNO4vwYOuoBgFhFWc0KoQiAjZk6R1BqAVFMagQFlJ/qLBpSlqq 5DpTWTxR99Xg6DafN7n6mWg+jv2ckyTpEjozHbK4o3Z1vnuMTx6IIv+6w3N58uysxLEV wZ+w/1VVDF+Sc29zAqiSrnFnBTfudYz4y5yyhibWj9VlVVl7BxcDbC57qoNK5eU51HLy szzg== 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=tG2m9Eb/QpED6xZH5RNRbXGjt7iUmwaJQZ3O+bJSjik=; b=nETkvrmSdfCjyXvKICtXp04fzPKaAnii17uDMRYYeswBTxBcGeZ2D8cGNN8lwuU6DQ WdWesar/eeujruGiLpKo59kdddYEVWAjEV/tk6yvC0mYBLfZEuhQji9JCLVJr+GgEyCJ o7PXR1PDRz++EXbyt0j7HauLOfAo5N7HM2TFFP4CY4H+7yzl/HFQSm50fEYAhHmIc/ky 0IM8gyJJZtA8e61MEmNc6N7hw29/7BlNGUave3IgX7XxEa8YBPO5EELeCP8GClPO0CmD yJRPDaLESKEXLJOPw+MHqgSkBAExkJWZG48Z4OLjfyYiO32oq1G4uzlLkRoQwJdzW2Nt 0RYg== X-Gm-Message-State: AOAM533xs8ZQj3mFv/J5NfKS3r0qzlp3OmnX6/+qAETkH/hmZnjbU/N1 9wQodJb6hRc2JhoVYzqeL7oSGNnW2L9CXXC8NxbzPA== X-Google-Smtp-Source: ABdhPJw+4JDSXbihdqgsJkSuL8//ZtvxJUM8wlKiniYNNqTHvfUrkVgxPGBRldmFjZ8q9dfTi7kRwzN5Yb+/LJjoMl8= X-Received: by 2002:ac8:675a:: with SMTP id n26mr10097688qtp.101.1619897811859; Sat, 01 May 2021 12:36:51 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Sat, 1 May 2021 13:36:39 -0600 Message-ID: Subject: Re: Ports tree have been migrated to git To: Kurt Jaeger Cc: Li-Wen Hsu , git@freebsd.org X-Rspamd-Queue-Id: 4FXfd12rxDz4qcg X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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: Sat, 01 May 2021 19:36:53 -0000 On Sat, May 1, 2021, 1:27 PM Kurt Jaeger wrote: > Hi! > > Thanks for posting more details. With some additional posts > in other places, I was finally able to understand most of the > workflow. > > I even use the testing area to test commits 8-} > > > - This is still a young service, please don't treat it too > > aggressively. The testing area is at: > > > > https://cgit-dev.freebsd.org/ports/ > > But right now I'm stuck with the following problem: > > I testbuild by having a default ports tree: > > $ poudriere ports -l > PORTSTREE METHOD TIMESTAMP PATH > default git+https 2021-05-01 21:04:04 /pou/ports/default > > Right now, for reasons that are unclear to me, I still have some > local commit hanging around in that tree that I can't get removed. > > I've used a lot of combinations of > > git rebase > git revert > git reset > > etc, short of removing and re-cloning that tree, because > I'm behind a slow DSL connection and it will take approx. 30minutes > to refetch that ports tree. > > Can someone please help me understand how to just get rid of > some commit not yet pushed ? > git reset --hard HEAD^ removes the last commit from the branch you have checked out. You can put any rev in place of HEAD^ if you know that is where you want to roll back to. You might use "freebsd/main" to reset to upstream (assuming you use the freebsd origin convention). Also, git reflog will remember, for a while, all the branch moves and you can use that to recover those local commits. Warner > -- > pi@FreeBSD.org +49 171 3101372 Now what ? > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" >