From nobody Sun Apr 28 19:50:43 2024
X-Original-To: dev-commits-ports-all@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 4VSHBd2YHJz5Jr74;
	Sun, 28 Apr 2024 19:50:49 +0000 (UTC)
	(envelope-from jbeich@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
	 client-signature RSA-PSS (4096 bits) client-digest SHA256)
	(Client CN "freefall.freebsd.org", Issuer "R3" (verified OK))
	by mx1.freebsd.org (Postfix) with ESMTPS id 4VSHBc6dQhz45SX;
	Sun, 28 Apr 2024 19:50:48 +0000 (UTC)
	(envelope-from jbeich@freebsd.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1714333848;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
	 in-reply-to:in-reply-to:references:references;
	bh=8jC3xx7x+FKAQbllypWLMROKBQAazqyWNMrkpeJZYHQ=;
	b=c42HrYFOoRQKoGR648HXxk0X6JP1PeqWhc4U43MmtkCoXwmbpft0F7plq/HKYf5uPvSKVz
	OEcDjCOlT8aahy4KS7tCIpPUV0P5PQT5XPS6gTJ3HVeV+E+hXgIlOKGYZGSMTiIZj4qy4L
	fWKjs8ifz8feOvrnvSVy0eOb+NXmjFI/JmD8y3xL6TQgFeZL2qmo2hk6OCc8g75F9b0JQG
	5w2cJqiHcGDJKmOiAOCmPOwFd4AwvrVasowZKXNkOMlS8Gto1UwK64cltlLKE/PPU+6ZO7
	STX5YhtyElgxBeyG0wytKxMZIjKLfWm1fR93+kr0wzekyfyTeJFgsw7G6iDfZA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714333848; a=rsa-sha256; cv=none;
	b=kmo1Wb5V/bHwTjweYE+SBgJPGJUh57HWrJAh9xdiP3sbfm4BLS3nKrWnvhEWAuSieVxNj0
	8rEW+eISKI938psDjfN/TxkaXHEgnPL5c9/MThCnHNJ411fLjvATi8+dUcmzvkT1492szT
	o9cjFFHXCLhItxkMVyREkyjqcOUrC0UFkYzbHsbTofu5SpAZVtMaH6hmV6w2G9yt5IGfNb
	7tFOUwA+ReCTsiKKX67gYxNAuWjMb3CzjMmZ37lfH44k169lAMPX2IeYnhN1uiBzlgHJ29
	0KazIRuN3W8lgtCxhofi7IjY5sRJZKHDLVH7u3cbIM1bJMjb4bVIH/HKexKTKA==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1714333848;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
	 in-reply-to:in-reply-to:references:references;
	bh=8jC3xx7x+FKAQbllypWLMROKBQAazqyWNMrkpeJZYHQ=;
	b=bjfSNHlyNIxhT20/K8eOioycy0RduXiyhm2s21EStX2ZeqL17MzEI3a9xsATakkSEda87i
	NJf4RstNpt/VzEp6NOe4LaixPzSYkReoX3v5IJkp5f4e2rLkc/5OtqAQwM1y3RdPVIHw7t
	Hn+6pUvlzt8yLpJf8YYIvGvaqKBFoSLSIpurbix4rXKPmZz2pOtVdbqUUc092oBW0/c4gk
	kkKmWs+wssosNP85/yEi0rAndZhYcPJKGtf0d6TknTk5mBspmXSC7Qcekm7f9+Nb6FQfZ0
	sEQ9slPF0YYJkVT2vLXWp5RY7QXZajyEHfi3CgYnDXnHO10oE1qkFTZ/S8sLpw==
Received: by freefall.freebsd.org (Postfix, from userid 1354)
	id C9A0CB442; Sun, 28 Apr 2024 19:50:48 +0000 (UTC)
From: Jan Beich <jbeich@FreeBSD.org>
To: Nuno Teixeira <eduardo@freebsd.org>
Cc: Emanuel Haupt <ehaupt@freebsd.org>,
	ports-committers@freebsd.org,
	dev-commits-ports-all@freebsd.org,
	dev-commits-ports-main@freebsd.org
Subject: Re: git: 4ab6c1871671 - main - */*: Remove GNU_CONFIGURE_MANPREFIX
In-Reply-To: <CAFDf7UJHwsBYMqTsB0YdL=iNH190mwqx7LtZybEOGmb0E48d=Q@mail.gmail.com>
	(Nuno Teixeira's message of "Sun, 28 Apr 2024 20:18:08 +0100")
References: <202404121936.43CJa5vU012745@gitrepo.freebsd.org>
	<CAFDf7UJ1xcJLL5t+K6VGtN7T4vA9a4TtoRR9pr2N34EcRUO85g@mail.gmail.com>
	<20240428144959.4fe9e4e0ca163f1dc7b4788a@FreeBSD.org>
	<zftd-l564-wny@FreeBSD.org>
	<CAFDf7UJHwsBYMqTsB0YdL=iNH190mwqx7LtZybEOGmb0E48d=Q@mail.gmail.com>
Date: Sun, 28 Apr 2024 21:50:43 +0200
Message-ID: <34r5-jmgc-wny@FreeBSD.org>
List-Id: Commit messages for all branches of the ports repository <dev-commits-ports-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all
List-Help: <mailto:dev-commits-ports-all+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-all+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-ports-all@freebsd.org
Sender: owner-dev-commits-ports-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain

Nuno Teixeira <eduardo@freebsd.org> writes:

> Hello,
>
> That said, bug 278589 MFH looks trivial:
>>
>> $ git cherry-pick -x 09151791bf5e
>> $ git reset @~1
>> $ git add -p # Skip GNU_CONFIGURE_MANPREFIX part
>> $ git commit -c @{1}
>> <Remove GNU_CONFIGURE_MANPREFIX from the commit message>
>>
>
> $ git commit -c @{1}
> fatal: could not lookup commit '@1'

Try quoting { and } symbols. Alternatively, use ORIG_HEAD instead of @{1}.
I don't use ORIG_HEAD myself as it may not exist or point to a wrong commit,
and it's hard to remember which Git actions create ORIG_HEAD.

@ is HEAD, @~1 is previous commit, @{1} is previous state of the branch.
For notation details see git-rev-parse(1). For all states see git-reflog(1).