From nobody Wed Sep 18 15:37:21 2024 X-Original-To: git@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 4X82pf51QXz5WdZ7 for ; Wed, 18 Sep 2024 15:37:46 +0000 (UTC) (envelope-from Alexander@Leidinger.net) Received: from mailgate.Leidinger.net (mailgate.leidinger.net [IPv6:2a00:1828:2000:313::1:5]) (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 ECDSA (P-256) client-digest SHA256) (Client CN "mailgate.leidinger.net", Issuer "E5" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X82pf31Wsz4MQ9; Wed, 18 Sep 2024 15:37:46 +0000 (UTC) (envelope-from Alexander@Leidinger.net) Authentication-Results: mx1.freebsd.org; none List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@FreeBSD.org MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leidinger.net; s=outgoing-alex; t=1726673863; 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=BnqzGgs/nEIg8pnSD11k6qxyJj0tCaRzq9ib2kN/e3A=; b=SaeTmhRI52pm3vI8fliCsjS5HbA0j6NODk/SveQ3SggG3EOSFxxRrYLMbt+l3UXIJcdBtR tqXfvEST3brTtiStMlU5q47Ieo8yUPx/LAzxGf1v98T+FKnnn5PCZcfc5jR1oPD/yM+2IX m+M5gLiKxtc+4+QzCv1xtqH5aqxZ8j1gbGjlgtJLgUhzRw3TkAJtHdn1M+EKgX0oCg8gFX fx6L5bMGRmsZDJcnQlwreg+AG2lUZWO7b6nQ6lNSDBZnQuusu8VA4H1ZUusMCDfq7LLn1q Yu7qlJ8RDDzuxy2uuSqi7Woz6KIgODzRWxAHUJRlQMUoQuXRqQXfNd55j9I1yA== Date: Wed, 18 Sep 2024 17:37:21 +0200 From: Alexander Leidinger To: Philip Paeps Cc: git@freebsd.org Subject: Re: Issue with git add In-Reply-To: <40DEBC29-8D48-4FF4-845C-508108BF8B09@freebsd.org> References: <03a47b71f3b000bf05c630c79d23c2d4@Leidinger.net> <40DEBC29-8D48-4FF4-845C-508108BF8B09@freebsd.org> Message-ID: <19984b4d6b1a11bf58ba808cbd04aad9@Leidinger.net> Organization: No organization, this is a private message. Content-Type: multipart/signed; protocol="application/pgp-signature"; boundary="=_f8c6b4b47830bc213dd4cf2967629d73"; micalg=pgp-sha256 X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:34240, ipnet:2a00:1828::/32, country:DE] X-Rspamd-Queue-Id: 4X82pf31Wsz4MQ9 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --=_f8c6b4b47830bc213dd4cf2967629d73 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed Am 2024-09-18 16:29, schrieb Philip Paeps: > On 2024-09-18 22:00:56 (+0800), Alexander Leidinger wrote: >> git add doesn't add files. And I don't see them in git status: >> ---snip--- >> Mittwoch, 18. September 2024, 15:03:11 >> {0} [commit:~/FreeBSD/GIT/ports] >> (256) netchild@ttypts/2 % export LC_ALL=C >> >> Wednesday, 18. September 2024, 15:03:18 >> {0} [commit:~/FreeBSD/GIT/ports] >> (257) netchild@ttypts/2 % git apply >> /tmp/0001-www-lua-resty-session3-new-port-sticking-to-version-.patch > > > This creates a commit. From the man-page: "This command applies the patch but does not create a commit." But now that you told it, I tried "git am" first, and I was seeing the same behavior was puzzled, and tried git apply. And "git am "seems to create commits, but it doesn't tell so in the description, only the man page of git-apply tells this. Deleting the directory + git status confirms that it is committed, "git commit --amend" too. Pft. Ok, PEBCAK + man-page problem. Problem solved. Thanks, Alexander. -- http://www.Leidinger.net Alexander@Leidinger.net: PGP 0x8F31830F9F2772BF http://www.FreeBSD.org netchild@FreeBSD.org : PGP 0x8F31830F9F2772BF --=_f8c6b4b47830bc213dd4cf2967629d73 Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc; size=833 Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEER9UlYXp1PSd08nWXEg2wmwP42IYFAmbq88EACgkQEg2wmwP4 2IYt0w/+Np68jXpxJ+JR47N+sVmwBmhChXmSskEeDipmybD319+5Q7YB0WS80HZp ZyvvCDxfsqLEnumvS9gRbxlIUPPVgmjdsY+U7hUA1fy90HHD47EKEyuevlFEPn3a hRZp0ikBs4J0AQTS0kZm9mnBiV6sia46agQoXun7sDbjlkEDy6umd4JrOrdpbYmV caKW6HuHq91o4PVabO1moflvS9aOtxn14sTQBZ82czVD9l+/2kfDZwSNOQsMe2Ai xBjVNRCoOxabAbi+La848vOSH3keWxqECYkwkFNgE1Fmwhmy7bc7C3WMGKX4Of1I 23rDelgrqCbCbEhqRPfBP9smqqg0Mk2Z3xiwH2M4RbwDnLnu6UF0a3Kpdgy9h9az +ucxTlvo7/LDV3AouSBHiNGtz5JLXXABpubb5xcp68oD9s4G/h6Q2N3wryrcOn3r u4n6+CTKKFVlaUGRnQIJlVd58YWMnXUiV5k6w4lVRAzziBRgN6K5oyh5DM9HGIMl BulJe2u3FMfF1b9aHahdf+SX4QZhittzM0Oz0vfTPh5JEvW3y+3kW87SsilsF2bo gRlASkBmhbcsQFsMuf24gax4BnxovvO0Eehz7VBY+7EZC22YgpRKscfgxE8TPyha 77yULABKu/fv9guxiUPOkQ45qn0pbHSxxzgO1RHpP+fexEVDrRg= =SD8C -----END PGP SIGNATURE----- --=_f8c6b4b47830bc213dd4cf2967629d73--