From nobody Wed May 17 16:49:32 2023 X-Original-To: freebsd-current@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QLzbt5hxBz4BLbw for ; Wed, 17 May 2023 16:49:46 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-vk1-f178.google.com (mail-vk1-f178.google.com [209.85.221.178]) (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 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QLzbr74lNz42Nd for ; Wed, 17 May 2023 16:49:44 +0000 (UTC) (envelope-from asomers@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of asomers@gmail.com designates 209.85.221.178 as permitted sender) smtp.mailfrom=asomers@gmail.com; dmarc=none Received: by mail-vk1-f178.google.com with SMTP id 71dfb90a1353d-44ff2f8ec9dso665215e0c.1 for ; Wed, 17 May 2023 09:49:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684342184; x=1686934184; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IRPCgJVCR7iAV+UamH2XcvIpjebzPxgRNJxqwniHC3E=; b=jeoUFjAdw3pleHHPqmWnAeMbjsihvZSnaMsnIk3qJDhLBP1OuUXhH55poNmccTJnW2 7Fkzd1SzajzESSbA2W/xCpoTlGJJxY2A67BeKJe8wIhDbf8P8pCU/GBxIaYUw8FUENx2 ySnNCkYa8TTPQz5Qdhlg3u+yYctK0DeyTjg+IBpcCEg6Z6ohDLjlHhHwEqL97aJlN8SZ CwHUBSTYtHZNApjifnJmlQcrslrOv5CoEYJf2Wi0bEuVtKJcM++0FDabcJRr7M3sAK91 HiEr7vEZgOX6RpkVqv5SV395iqzUTfowIjdMxn53vrJLsOdgOJ1oU1XHlPtEGJLcWE1v 2yRg== X-Gm-Message-State: AC+VfDwRJooy1SsrecF3dCtJWCOtIFuON5eRbOZ3HTFZlBHv5ZXiR3Fs ly9y/Ctr4UbsKg79qmfHwmlaHSPwpLNfqcDD15vh6l1m3e4= X-Google-Smtp-Source: ACHHUZ5W2NEMeON9ll9Vv82g44Hz/SKZTMW7Q+xuoktS2aTU69uNyA1A+2fwlTq4fuV+3OQHABK474qOWaE0uesc09k= X-Received: by 2002:a1f:418a:0:b0:451:df12:177a with SMTP id o132-20020a1f418a000000b00451df12177amr15795063vka.14.1684342183839; Wed, 17 May 2023 09:49:43 -0700 (PDT) List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org MIME-Version: 1.0 References: In-Reply-To: From: Alan Somers Date: Wed, 17 May 2023 09:49:32 -0700 Message-ID: Subject: Re: what do I do when git cherry-pick works, but results are bogus? To: Rick Macklem Cc: FreeBSD CURRENT Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-1.36 / 15.00]; SUBJECT_ENDS_QUESTION(1.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_LONG(-0.73)[-0.727]; NEURAL_HAM_MEDIUM(-0.63)[-0.633]; FORGED_SENDER(0.30)[asomers@freebsd.org,asomers@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; TAGGED_RCPT(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; DMARC_NA(0.00)[freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[209.85.221.178:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MLMMJ_DEST(0.00)[freebsd-current@freebsd.org]; FREEMAIL_TO(0.00)[gmail.com]; TO_DN_ALL(0.00)[]; FREEFALL_USER(0.00)[asomers]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCPT_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; FROM_NEQ_ENVFROM(0.00)[asomers@freebsd.org,asomers@gmail.com]; ARC_NA(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.221.178:from]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Queue-Id: 4QLzbr74lNz42Nd X-Spamd-Bar: - X-ThisMailContainsUnwantedMimeParts: N On Wed, May 17, 2023 at 9:44=E2=80=AFAM Rick Macklem wrote: > > So, the subject line basically says it. > I do a git cherry-pick to MFC. It works, but the resultant file(s) are no= t > correct. What do I do to fix this? > (If the merge fails, then it's easy, but there doesn't seem to be an opti= on > on cherry-pick that forces it into "merge failed", so you can edit/add t= he file > and then "git cherry-pick --continue".) > > Thanks for any help with this, rick After a cherry-pick that doesn't give you quite what you want, edit the file until it has the correct contents, then do "git commit --amend /path/to/file".