From nobody Sat Aug 13 15:55:49 2022 X-Original-To: freebsd-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 4M4lWj5XS8z4ZBqV for ; Sat, 13 Aug 2022 15:56:01 +0000 (UTC) (envelope-from eduardo@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M4lWj50Mkz3KFN for ; Sat, 13 Aug 2022 15:56:01 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660406161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=w21h+gUCy38dnDE3bA1rw1QUhB/S3kXP1vDrxukkva8=; b=fUH7GiWf/JWnU7F5BuEwTpver0Cx3XcjJWFP4g9YwEVucQ8lOBQD7rBIvVbz4HxgM/lgEW ytGHJvBk1lwrhNezSVCigN+6dVvG7DRF+SvGxoS7sgxZKa14BEtzIoUror3y92LbrRjQL6 JILzIErXPKxO5Z4eNamCmlsy0yemmqjZ2IpGoL7QOkdxVcEMpjqc1XSSxpsQhlNk6247IX Ne2C8AjMmG+hrAKue7j6zrf4CPUuL6Bmu4iOQMjoeahKcnHPnE8zYP36NVqxBFs5SqwXv5 IgzsoBL4r0hhc7FWvPGiwXos+p68ENXTkM58rXbEuw4Q6o5ryKvIxc2MJyA1Fw== Received: from mail-vk1-f175.google.com (mail-vk1-f175.google.com [209.85.221.175]) (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)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4M4lWj42xwzmXF for ; Sat, 13 Aug 2022 15:56:01 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-vk1-f175.google.com with SMTP id t64so1833183vkb.12 for ; Sat, 13 Aug 2022 08:56:01 -0700 (PDT) X-Gm-Message-State: ACgBeo2ZbryiIy9VhwefR3byqG/zpMSPP51mXIUxPNsbpvlzcigLBys4 EnbEHWsFtcssz19Hci5eTe83WJNkPoyyUwNZZRY= X-Google-Smtp-Source: AA6agR7ivHpqb9Th088H1xE/s4cP3zFznvP+5yoMMJJ7jHGGTA35+vhSh3CLbXPw+EMG7uhYQsNK8BDUBH6SXZKrDpI= X-Received: by 2002:a1f:188a:0:b0:377:226b:7cd6 with SMTP id 132-20020a1f188a000000b00377226b7cd6mr3709502vky.24.1660406161189; Sat, 13 Aug 2022 08:56:01 -0700 (PDT) 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 References: <99af6a44013b44d7ec1196bc3809e3aa@FreeBSD.org> In-Reply-To: From: Nuno Teixeira Date: Sat, 13 Aug 2022 16:55:49 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git wants to commit more files than expected ? To: freebsd-git Content-Type: multipart/alternative; boundary="0000000000006bb1a405e6216f51" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660406161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=w21h+gUCy38dnDE3bA1rw1QUhB/S3kXP1vDrxukkva8=; b=k2b/NFUbcCjVbOtgSrf3drBElcL0wtMDs3rS78UvbNEcxtqiuDEhUvONFHyIstCFasePxy CeKiBdpyE957XZ9O0hKmJEKZMovChplu/P5KyoYv+703ZxunWwrUf+E52wKZ10MPsSjYeU lQ5p1rKcaCGRUXmex5AM8tCnIv6tPLtXAJQVf8psD1R0TD16Fz8V4OLj0tX/+badklmRlN kbTtdQJqbnmNJW5ft6pGtui/xF83h/WMRDMyoYxQCZDsMzHVx2JAtIfsYk3i18XrjOtqGd G/F3dRlGrfVqkLyW9QhD0tJHu9vnAlTLnPNChNZ755I4oYLlByFXGulufexUiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660406161; a=rsa-sha256; cv=none; b=l/o98kQwvBy3bTWd2GJQXDoEn3drvE7WYpMxs1SChsdIET9xPsUYrN/iyK6Ouifb/afsv7 sX7d5tKNHtbQBUexDObwy/35USX7Or8+C03z8YVabXBwZwviz7wa38bdvSr3r34BiM0HTk nfUPH+B4GiGVKP9652TvP0SQhQX974Mp4g+FX2R6rFjUx3JAbHCB24VxgghetTJAzo0c+o OErjJcyumhSWM3npkzjUiQW53V1dCxtpljuU/NjOwk/FISQVMpKewB5CGgjpvwCGWJfdiJ HD3V8MtGkKOv4rEwc16w1Rp8rQpf1g/C9H/axHmvzPZE8YdpVq0FE4xhjfjL6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N --0000000000006bb1a405e6216f51 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable *** `git reset --hard HEAD^` Nuno Teixeira escreveu no dia s=C3=A1bado, 13/08/2022= =C3=A0(s) 16:45: > Hi, > > I always forgot to use `git commit --amend` when commit needed some > correction/change. I usually do a `git reset --hard ^HEAD` and then commi= t > from scratch :) > > Next commit I do I will use amend and see if I got similar problem like > yours. > > Cheers, > > Kurt Jaeger escreveu no dia s=C3=A1bado, 13/08/2022 =C3= =A0(s) > 16:27: > >> Hi! >> >> > > But if I run a git commit, additional two files turn up: >> > > >> > > # Changes to be committed: >> > > # modified: archivers/py-borgbackup/Makefile >> > > # new file: archivers/py-borgbackup/files/patch-setup.py >> > > # modified: print/pdf-tools/Makefile >> > > # modified: print/pdf-tools/distinfo >> > > >> > > Why isn't git status not reporting the two pdf-tools files, >> > > but git commit is ? >> > >> > Could you share the 'git commit' command-line that you're using ? >> >> It was this: >> >> git commit --amend --author=3D'Jose G. Juanino ' >> archivers/py-borgbackup >> >> > If I've to guess then you're probably including the '-a' switch of git >> > commit. If yes, then please don't include it. >> >> I now tried this: >> >> git commit --author=3D'Jose G. Juanino ' >> archivers/py-borgbackup >> >> and it worked! Thanks! >> >> -- >> pi@FreeBSD.org +49 171 3101372 Now what ? >> >> > > -- > Nuno Teixeira > FreeBSD Committer (ports) > --=20 Nuno Teixeira FreeBSD Committer (ports) --0000000000006bb1a405e6216f51 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
*** `git reset --hard HEAD^`

Nuno Teixeira <eduardo@freebsd.org> escreveu no dia s=C3= =A1bado, 13/08/2022 =C3=A0(s) 16:45:
Hi,

I a= lways forgot to use `git commit --amend` when commit needed some correction= /change. I usually do a `git reset --hard ^HEAD` and then commit from scrat= ch :)

Next commit I do I will use amend and see if= I got similar problem like yours.

Cheers,

Kurt = Jaeger <pi@freebsd.o= rg> escreveu no dia s=C3=A1bado, 13/08/2022 =C3=A0(s) 16:27:
Hi!

> > But if I run a git commit, additional two files turn up:
> >
> > # Changes to be committed:
> > #=C2=A0 =C2=A0 =C2=A0 =C2=A0modified:=C2=A0 =C2=A0archivers/py-bo= rgbackup/Makefile
> > #=C2=A0 =C2=A0 =C2=A0 =C2=A0new file:=C2=A0 =C2=A0archivers/py-bo= rgbackup/files/patch-setup.py
> > #=C2=A0 =C2=A0 =C2=A0 =C2=A0modified:=C2=A0 =C2=A0print/pdf-tools= /Makefile
> > #=C2=A0 =C2=A0 =C2=A0 =C2=A0modified:=C2=A0 =C2=A0print/pdf-tools= /distinfo
> >
> > Why isn't git status not reporting the two pdf-tools files, > > but git commit is ?
>
> Could you share the 'git commit' command-line that you're = using ?

It was this:

git commit --amend --author=3D'Jose G. Juanino <jjuanino@gmail.com>' archive= rs/py-borgbackup

> If I've to guess then you're probably including the '-a= 9; switch of git
> commit. If yes, then please don't include it.

I now tried this:

git commit --author=3D'Jose G. Juanino <jjuanino@gmail.com>' archivers/py-bo= rgbackup

and it worked! Thanks!

--
pi@FreeBSD.org=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0+49 171 3101372=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Now what ?



--
Nuno Teixeira
FreeBSD Co= mmitter (ports)


--
Nun= o Teixeira
FreeBSD Committer (ports)
--0000000000006bb1a405e6216f51--