From nobody Wed Sep 18 14:00:56 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 4X80gW6Ps0z5WSPm for ; Wed, 18 Sep 2024 14:01:27 +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 4X80gW33hJz45cT for ; Wed, 18 Sep 2024 14:01:27 +0000 (UTC) (envelope-from Alexander@Leidinger.net) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=leidinger.net header.s=outgoing-alex header.b=yS8aC6Vl; dmarc=pass (policy=quarantine) header.from=leidinger.net; spf=pass (mx1.freebsd.org: domain of Alexander@Leidinger.net designates 2a00:1828:2000:313::1:5 as permitted sender) smtp.mailfrom=Alexander@Leidinger.net 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=1726668081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=sm5om77VmYFQIMjhFsa6Y9eouUX3NX2Hbt/nraL7Q1I=; b=yS8aC6VlSyzHTlM849/bFbfrFoWLLDwltF14UC/ZR6dFK3Zy3GRLQdvDUqGdV7dlEFEV/T zl/APY5JX9dI0y7IIn16ionjMREVZcCtXYzdceoaglaFHzX43H1dq61iUxWhUnXFpJW4le bEkVqqZ+ueNyEFjhuzzpAessa5vieC44bexRT1o/BItPohwFhmDQyiQjtB0sCtlrcFlaWb FxyiVP9wceV/IR5ryXKEImBXgfLbg9l7RMVlY3z+fHM2QG56Gcftg8UXx1M5W9PfsYIflA VO4b0WESAc8om4aEVVY7BkbGSCtAQTkOYhbm8NbyU/dp1pliL+Naj95D8xoqTg== Date: Wed, 18 Sep 2024 16:00:56 +0200 From: Alexander Leidinger To: git@freebsd.org Subject: Issue with git add Message-ID: <03a47b71f3b000bf05c630c79d23c2d4@Leidinger.net> Organization: No organization, this is a private message. Content-Type: multipart/signed; protocol="application/pgp-signature"; boundary="=_25bac237ef2fba95cac1f9c097489123"; micalg=pgp-sha256 X-Spamd-Result: default: False [-4.09 / 15.00]; SIGNED_PGP(-2.00)[]; NEURAL_HAM_SHORT(-0.99)[-0.987]; DMARC_POLICY_ALLOW(-0.50)[leidinger.net,quarantine]; R_DKIM_ALLOW(-0.20)[leidinger.net:s=outgoing-alex]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; R_SPF_ALLOW(-0.20)[+mx:c]; HAS_ORG_HEADER(0.00)[]; ASN(0.00)[asn:34240, ipnet:2a00:1828::/32, country:DE]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ARC_NA(0.00)[]; MISSING_XM_UA(0.00)[]; HAS_ATTACHMENT(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; TO_DN_NONE(0.00)[]; MLMMJ_DEST(0.00)[git@freebsd.org]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[leidinger.net:+] X-Rspamd-Queue-Id: 4X80gW33hJz45cT X-Spamd-Bar: ---- This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --=_25bac237ef2fba95cac1f9c097489123 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8; format=flowed Hi, 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 Wednesday, 18. September 2024, 15:03:24 {0} [commit:~/FreeBSD/GIT/ports] (25😎 netchild@ttypts/2 % git add www/lua-resty-session3 www/lua-resty-session3/* Wednesday, 18. September 2024, 15:03:41 {0} [commit:~/FreeBSD/GIT/ports] (259) netchild@ttypts/2 % git status On branch main Your branch is ahead of 'freebsd/main' by 1 commit. (use "git push" to publish your local commits) Changes to be committed: (use "git restore --staged ..." to unstage) modified: www/Makefile Wednesday, 18. September 2024, 15:03:48 {0} [commit:~/FreeBSD/GIT/ports] (260) netchild@ttypts/2 % ll www/lua-resty-session3 total 24 -rw-r--r-- 1 netchild netchild 1.9K Sep 18 15:03 Makefile -rw-r--r-- 1 netchild netchild 198B Sep 18 15:03 distinfo -rw-r--r-- 1 netchild netchild 493B Sep 18 15:03 pkg-descr ---snip--- What's wrong here? Bye, Alexander. -- http://www.Leidinger.net Alexander@Leidinger.net: PGP 0x8F31830F9F2772BF http://www.FreeBSD.org netchild@FreeBSD.org : PGP 0x8F31830F9F2772BF --=_25bac237ef2fba95cac1f9c097489123 Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc; size=833 Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEER9UlYXp1PSd08nWXEg2wmwP42IYFAmbq3SkACgkQEg2wmwP4 2IaApg//UIWMNkQvcmlehVyt4ZTe+cLPqkkfWCCfltp7cBjQD/+ULR0albclppUJ 0oLLbMyHdSlrEf7WGP5Jrm10YG3Tr+kJkos0hBhsuC+xISRC0jQMuSJHFo1/A4JM YS7tCDNv9Pz/WCU89W5QlYhU9o/5FvA7I2PgkMAUNbuTSMMg+terb+oazYuplCot eB+gMlUCuTQPafQw/MJ1I7b9pPa3417gOYHE56CTFTO4Y8bJ0eJ3zjxS7xVbo1d9 0i5fd2pwEPZ7BTmFXPS/cc2TW79pyH5gx99Yplb02QK+1KvzhQBKwbV0QCPzhTA5 xoPAK87ZhdVPp0o+7mDRL37n1otHgzRjq74wWb3JtNtnMEHV4UZM7P/CjRhcZEVt xoBY2Jwy12X6xotmWGaLAcHaqiRAs6YCa1y+Yo3vPCWtkr+JrVdqRuqNJqvDlZ2x 7TST1ra4MyPTmd6L8DcK2NdM3J6jpXyWkIntq5aGt1V8ukc+CB6z+MbHsymtPYql wM0I2M4XQLZB6wQKPr/rHiCfE09F1rUQlVgK+V62OVmCPzF7I/vk+oIxU6xmX7UM 2iymM89MCSL4e16YpiGWF3wxfHlu6ePwxL8RfLOqB1TSuz34Ah0DX+B9AfIAXDhA XXR35nHhTAfFYY7h9GOfxj/RsvGBp5MYI+UDo0mumaCir901MII= =8TAy -----END PGP SIGNATURE----- --=_25bac237ef2fba95cac1f9c097489123-- From nobody Wed Sep 18 14:15:16 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 4X80zW0r0Mz5WTBj for ; Wed, 18 Sep 2024 14:15:19 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X80zW0MKXz47Yf; Wed, 18 Sep 2024 14:15:19 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726668919; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=J32WAfeNxKNJj5If3w5yzBxNV9oN/yLVwtOPiC5HNNA=; b=fRmhXTIOF7T2ppDN9KW2ZAs/RUqXp3Jwx5U8jhx5njwUsaf5f6CWHbNOx0NRVrqUtjoYBY KdCllEnwyfIAM+3KjGc6i0MfTUZKHvdHPLknwh+KR/ZklhlI2Rfi3Qwvlqre/KSoyRtuw5 8EZrdrTd0erxQyuOGp1+ET+gISjBw0eZrXTNRfKNnQx4l3jxsdZdxLMNO8Sm9W5rxbGdJ4 jAKpDQ4dSiLpBTWBKuqtjSOSTijNq25NVe0oZ2Pflw3xIh+MefJnzj0GEMVbY/tffSqis2 P6+ihEr0DrBEBdsjDa6ryyuhcjx9GYarfE7U+BAoEGrTO7H3YFa9hZ8l91E8aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726668919; a=rsa-sha256; cv=none; b=oExHi5kQjSwMIDiCoAFldnp/zHiu+9bFLnXGxlYsvkgwsFCfgNDAHNDY36Net8Toyt81TE DXHrSiUMAq2ZERl6juE6x/t9XiYNovHhYhh4Ub0IXC5NgiamHcFLlXEsDFc1W6+3aR1R1T fnxRPxTfriOcPN7SdJsALx0SrFd3AGFgRKchdb9HsVucnZ6RH9RL/Tm+ZItE2YGgIGIp8L /gkn2a09G9g7eL1rprifrtieCNaYZeF9Z+o1n0AUfxlXbN/s6xbPMkhAiKOm7V7oBQuaDM qdnMh2IN8ikCj5/uUYpOEdZg4XTAiLYHFnjShbgRp1w4wGZL4U64RRSOMaoAOQ== 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=1726668919; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=J32WAfeNxKNJj5If3w5yzBxNV9oN/yLVwtOPiC5HNNA=; b=QZK6IEEmqPXvvxWLRBomva+AM3YtdPT3dsMLqC4pS1Kok+yxFIevQoOOJl9dPxA5lqvBIQ JKLVn6OYlpc83lcr34BBTLU3Z3il5Qi+5FGTOCFSkyrili5olSAfSB5vRX4lFw3uORBmpE hIXu2nDZIw9oWVbhDu8bASfQ+q5YYeEzEH5GovI1t6JcyqsiIfSD51ONmz+cx4XvUmotSP xPkRHpCcnoBgqNZeWfZ4RAZhEYwqvvDLatEzRYcZLB/8OXTw6CYl2JukxxsAbhxJikkrGY DMrysN4lHOFukAzbSmHIn5Z0gZ4u6v8kjEeKDyoLY6Vkk3oUQyz8z70EnCGgWQ== Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (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 (2048 bits) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "R10" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4X80zV6PMgzFj6; Wed, 18 Sep 2024 14:15:18 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (longrow.wg.andric.com [10.69.1.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 7BA9E6D287; Wed, 18 Sep 2024 16:15:17 +0200 (CEST) Content-Type: text/plain; charset=us-ascii 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 (Mac OS X Mail 16.0 \(3731.700.6.1.2\)) Subject: Re: Issue with git add From: Dimitry Andric In-Reply-To: <03a47b71f3b000bf05c630c79d23c2d4@Leidinger.net> Date: Wed, 18 Sep 2024 16:15:16 +0200 Cc: git@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <29DE1E03-2BE9-4E88-A8C9-B56DFE43F513@FreeBSD.org> References: <03a47b71f3b000bf05c630c79d23c2d4@Leidinger.net> To: Alexander Leidinger X-Mailer: Apple Mail (2.3731.700.6.1.2) On 18 Sep 2024, at 16:00, Alexander Leidinger = wrote: >=20 > 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=3DC >=20 > 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 For some reason, the .patch file didn't add files that you expected to = be added? If you run "git status" immediately after "git apply", do you = see any files listed in "Untracked files"? It might be enlightening if you post the actual .patch file. -Dimitry From nobody Wed Sep 18 14:29:15 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 4X81Hg46znz5WVgl for ; Wed, 18 Sep 2024 14:29:19 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X81Hg3N2xz49mZ; Wed, 18 Sep 2024 14:29:19 +0000 (UTC) (envelope-from philip@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726669759; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OVdXoeACDVVQEJZxZazcF4gICMHhtvnqYbQ/LOBGLNA=; b=RGk8HsVQKLK2MyueC3AJlzDTwiSgmqnqPIcAjTSnyN0DhONYKWr8ze5g3xLRZk6Ci/ccyg V2ZwXFvESwFNITQediTdomJg5te1Wwk4n8zPRQDNSL3CwrUzP5dXJ6c7nfcTcNoo5nh2ae ZUjJBUk5841aOfcVsMJXvrHsVqP5+Tm05gNvNSD/QVPZQ3lR/K46nXmVu55kyjr+E4lUkM HlqXJvPaDMiQO3d+uG3sqzzS+vXNWDeK/y+W0K1wabM7TFPDo+kp4s0mucuqav1VYBOvJ+ 7B3uf2w+Mm7oYqPTKBRjOPa+a/y19StK+wHxtnhQEKyyy8cBGjWRVIgRY65FTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726669759; a=rsa-sha256; cv=none; b=iUoYcDzIUDMjvc/VjHZfIjQGJIX44BZNx8AkZgtnV+K5dXMfcnR8vWiv/VCxsIVcLTQKmI relpRh4r+leLEZbwdC0X9i5qBli0T3waS/GKAJ16lrIop2tibzM57lUrEzf+EqLbItUAuS HcWqzQaHyQhQ7+4pZD8SQIDyIieiFSCVEAoWaq5MAgJeK6YqupNnmQTP/c62Ox+lSgVOrX NVvJF7B9A/MG2UEWyB9blXoB/aatm6vfhvWTTiyKv3IhQLaTZujbm7ziYNSAwA/s6Vi8uT NudBy3XjLBSJTv2Xiu+qteKNiBQo2tIxjwvzswM+ALcgCQqza44GCg7FuOfX1w== 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=1726669759; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OVdXoeACDVVQEJZxZazcF4gICMHhtvnqYbQ/LOBGLNA=; b=Bz/w1hLR8S5rk94VqgPbFfWN1NmpUcAisz6NfzK4jm4CY/1Y8G+Sj4od7sGEYBgbTPE47h NgOdMn8jMbkyUIOtwnPsMLKhQizvRsH8S6KK0zvBpCbWn3wPtPk8YlaCSWxNhoI2HqOkWA NHssW5+ForxRJwu23wyEtYd41+RtEoSR7SQwsI0+nAeB9WiYhKA5RADhxgZqbjeqwicD6A +Dclb+47Ygsgpx9r5Nn/pTUGYaYG5+rNjwOVQX9okkIFseKX/irnWPJoR5MBQCdlLRjm8l nKyE9IjoMfrbRW7EVuEWzMJEsiazqUcv/R2YFugNBKCS7PXatwky1Y6S8FlXKQ== Received: from fauth2-smtp.messagingengine.com (fauth2-smtp.messagingengine.com [103.168.172.201]) (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 did not present a certificate) (Authenticated sender: philip/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4X81Hg2cWmzG21; Wed, 18 Sep 2024 14:29:19 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from phl-compute-05.internal (phl-compute-05.phl.internal [10.202.2.45]) by mailfauth.phl.internal (Postfix) with ESMTP id 6C64E120006A; Wed, 18 Sep 2024 10:29:18 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-05.internal (MEProxy); Wed, 18 Sep 2024 10:29:18 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudekledgjeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephffvvefufffokfgjfhggtgfgsehtkehmtdertdej necuhfhrohhmpefrhhhilhhiphcurfgrvghpshcuoehphhhilhhiphesfhhrvggvsghsug drohhrgheqnecuggftrfgrthhtvghrnhepkeehhfeltdevieeukeehteevueffvdfhteek keehtdevudffieffveetvddukedvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrg hmpehmrghilhhfrhhomhepphhhihhlihhpodhmvghsmhhtphgruhhthhhpvghrshhonhgr lhhithihqdduudeiiedviedvgeekqddvfeehudektddtkedqphhhihhlihhppeepfhhrvg gvsghsugdrohhrghesthhrohhusghlvgdrihhspdhnsggprhgtphhtthhopedvpdhmohgu vgepshhmthhpohhuthdprhgtphhtthhopegrlhgvgigrnhguvghrsehlvghiughinhhgvg hrrdhnvghtpdhrtghpthhtohepghhithesfhhrvggvsghsugdrohhrgh X-ME-Proxy: Feedback-ID: ia691475d:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 18 Sep 2024 10:29:17 -0400 (EDT) From: Philip Paeps To: Alexander Leidinger Cc: git@freebsd.org Subject: Re: Issue with git add Date: Wed, 18 Sep 2024 22:29:15 +0800 X-Mailer: MailMate (1.14r6065) Message-ID: <40DEBC29-8D48-4FF4-845C-508108BF8B09@freebsd.org> In-Reply-To: <03a47b71f3b000bf05c630c79d23c2d4@Leidinger.net> References: <03a47b71f3b000bf05c630c79d23c2d4@Leidinger.net> 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 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 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. > Wednesday, 18. September 2024, 15:03:24 > {0} [commit:~/FreeBSD/GIT/ports] > (25😎 netchild@ttypts/2 % git add www/lua-resty-session3 > www/lua-resty-session3/* Does git status before git add show any modified files? > Wednesday, 18. September 2024, 15:03:41 > {0} [commit:~/FreeBSD/GIT/ports] > (259) netchild@ttypts/2 % git status > On branch main > Your branch is ahead of 'freebsd/main' by 1 commit. > (use "git push" to publish your local commits) Try git show. You might want git reset. Or git commit --amend. > What's wrong here? Nothing. Probably. :-D Philip 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--