Date: Sat, 13 Aug 2022 09:54:37 -0600 From: Warner Losh <imp@bsdimp.com> To: Nuno Teixeira <eduardo@freebsd.org> Cc: freebsd-git <freebsd-git@freebsd.org> Subject: Re: git wants to commit more files than expected ? Message-ID: <CANCZdfpEvQEbaxoDXfqN7kPzwH9dsZFiTx2ajBtw4XU2p8oJNw@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>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Sat, Aug 13, 2022 at 9:45 AM Nuno Teixeira <eduardo@freebsd.org> wrote: > 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 commit > from scratch :) > > Next commit I do I will use amend and see if I got similar problem like > yours. > git rebase -i freebsd/main main is what I do when I'm working on main and need to 'curate' the commits. Warner > Cheers, > > Kurt Jaeger <pi@freebsd.org> escreveu no dia sábado, 13/08/2022 à(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='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='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) > [-- Attachment #2 --] <div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Sat, Aug 13, 2022 at 9:45 AM Nuno Teixeira <<a href="mailto:eduardo@freebsd.org">eduardo@freebsd.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div>Hi,</div><div><br></div><div>I always forgot to use `git commit --amend` when commit needed some correction/change. I usually do a `git reset --hard ^HEAD` and then commit from scratch :)</div><div><br></div><div>Next commit I do I will use amend and see if I got similar problem like yours.<br></div></div></blockquote><div><br></div><div>git rebase -i freebsd/main main</div><div><br></div><div>is what I do when I'm working on main and need to 'curate' the commits.</div><div><br></div><div>Warner</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div></div><div>Cheers,<br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Kurt Jaeger <<a href="mailto:pi@freebsd.org" target="_blank">pi@freebsd.org</a>> escreveu no dia sábado, 13/08/2022 à(s) 16:27:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-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> > > # modified: archivers/py-borgbackup/Makefile<br> > > # new file: archivers/py-borgbackup/files/patch-setup.py<br> > > # modified: print/pdf-tools/Makefile<br> > > # modified: print/pdf-tools/distinfo<br> > > <br> > > Why isn't git status not reporting the two pdf-tools files,<br> > > 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='Jose G. Juanino <<a href="mailto:jjuanino@gmail.com" target="_blank">jjuanino@gmail.com</a>>' archivers/py-borgbackup<br> <br> > If I've to guess then you're probably including the '-a' switch of git <br> > commit. If yes, then please don't include it.<br> <br> I now tried this:<br> <br> git commit --author='Jose G. Juanino <<a href="mailto:jjuanino@gmail.com" target="_blank">jjuanino@gmail.com</a>>' archivers/py-borgbackup<br> <br> and it worked! Thanks!<br> <br> -- <br> pi@FreeBSD.org +49 171 3101372 Now what ?<br> <br> </blockquote></div><br clear="all"><br>-- <br><div dir="ltr"><div dir="ltr"><span style="color:rgb(102,102,102)">Nuno Teixeira<br>FreeBSD Committer (ports)</span></div></div> </blockquote></div></div>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfpEvQEbaxoDXfqN7kPzwH9dsZFiTx2ajBtw4XU2p8oJNw>