Date: Sat, 13 Aug 2022 16:55:49 +0100 From: Nuno Teixeira <eduardo@freebsd.org> To: freebsd-git <freebsd-git@freebsd.org> Subject: Re: git wants to commit more files than expected ? Message-ID: <CAFDf7UJnYLOvT3fdySBxw-RsEYB5H2t=yGRRQK6OsQnUgsBTBQ@mail.gmail.com> In-Reply-To: <CAFDf7U%2BQCPu%2BYCHqfJ%2BhmvgiX2j=W0qRRjCvnxbdmPns=fN37g@mail.gmail.com> References: <Yvd0ziIpQpZTjVyd@fc.opsec.eu> <99af6a44013b44d7ec1196bc3809e3aa@FreeBSD.org> <YvfC8Inx6FtrlaT6@fc.opsec.eu> <CAFDf7U%2BQCPu%2BYCHqfJ%2BhmvgiX2j=W0qRRjCvnxbdmPns=fN37g@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--0000000000006bb1a405e6216f51 Content-Type: text/plain; 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 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 <pi@freebsd.org> 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 <jjuanino@gmail.com>' >> 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 <jjuanino@gmail.com>' >> 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 <div dir=3D"ltr">*** `git reset --hard HEAD^`</div><br><div class=3D"gmail_= quote"><div dir=3D"ltr" class=3D"gmail_attr">Nuno Teixeira <<a href=3D"m= ailto:eduardo@freebsd.org">eduardo@freebsd.org</a>> escreveu no dia s=C3= =A1bado, 13/08/2022 =C3=A0(s) 16:45:<br></div><blockquote class=3D"gmail_qu= ote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,20= 4);padding-left:1ex"><div dir=3D"ltr"><div>Hi,</div><div><br></div><div>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 :)</div><div><br></div><div>Next commit I do I will use amend and see if= I got similar problem like yours.<br><br></div><div>Cheers,<br></div></div= ><br><div class=3D"gmail_quote"><div dir=3D"ltr" class=3D"gmail_attr">Kurt = Jaeger <<a href=3D"mailto:pi@freebsd.org" target=3D"_blank">pi@freebsd.o= rg</a>> escreveu no dia s=C3=A1bado, 13/08/2022 =C3=A0(s) 16:27:<br></di= v><blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;borde= r-left:1px solid rgb(204,204,204);padding-left:1ex">Hi!<br> <br> > > But if I run a git commit, additional two files turn up:<br> > > <br> > > # Changes to be committed:<br> > > #=C2=A0 =C2=A0 =C2=A0 =C2=A0modified:=C2=A0 =C2=A0archivers/py-bo= rgbackup/Makefile<br> > > #=C2=A0 =C2=A0 =C2=A0 =C2=A0new file:=C2=A0 =C2=A0archivers/py-bo= rgbackup/files/patch-setup.py<br> > > #=C2=A0 =C2=A0 =C2=A0 =C2=A0modified:=C2=A0 =C2=A0print/pdf-tools= /Makefile<br> > > #=C2=A0 =C2=A0 =C2=A0 =C2=A0modified:=C2=A0 =C2=A0print/pdf-tools= /distinfo<br> > > <br> > > Why isn't git status not reporting the two pdf-tools files,<b= r> > > but git commit is ?<br> > <br> > Could you share the 'git commit' command-line that you're = using ?<br> <br> It was this:<br> <br> git commit --amend --author=3D'Jose G. Juanino <<a href=3D"mailto:jj= uanino@gmail.com" target=3D"_blank">jjuanino@gmail.com</a>>' archive= rs/py-borgbackup<br> <br> > If I've to guess then you're probably including the '-a= 9; switch of git <br> > commit. If yes, then please don't include it.<br> <br> I now tried this:<br> <br> git commit --author=3D'Jose G. Juanino <<a href=3D"mailto:jjuanino@g= mail.com" target=3D"_blank">jjuanino@gmail.com</a>>' archivers/py-bo= rgbackup<br> <br> and it worked! Thanks!<br> <br> -- <br> 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 ?<br> <br> </blockquote></div><br clear=3D"all"><br>-- <br><div dir=3D"ltr"><div dir= =3D"ltr"><span style=3D"color:rgb(102,102,102)">Nuno Teixeira<br>FreeBSD Co= mmitter (ports)</span></div></div> </blockquote></div><br clear=3D"all"><br>-- <br><div dir=3D"ltr" class=3D"g= mail_signature"><div dir=3D"ltr"><span style=3D"color:rgb(102,102,102)">Nun= o Teixeira<br>FreeBSD Committer (ports)</span></div></div> --0000000000006bb1a405e6216f51--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFDf7UJnYLOvT3fdySBxw-RsEYB5H2t=yGRRQK6OsQnUgsBTBQ>