Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 13 Aug 2022 09:43:03 -0600
From:      Warner Losh <imp@bsdimp.com>
To:        Kurt Jaeger <pi@freebsd.org>
Cc:        Ashish SHUKLA <ashish@freebsd.org>, freebsd-git <freebsd-git@freebsd.org>
Subject:   Re: git wants to commit more files than expected ?
Message-ID:  <CANCZdfqwDR3AH%2Bpn76i62GGrrnETskyovRoBzYCAQmQhmZ6w4w@mail.gmail.com>
In-Reply-To: <YvfC8Inx6FtrlaT6@fc.opsec.eu>
References:  <Yvd0ziIpQpZTjVyd@fc.opsec.eu> <99af6a44013b44d7ec1196bc3809e3aa@FreeBSD.org> <YvfC8Inx6FtrlaT6@fc.opsec.eu>

next in thread | previous in thread | raw e-mail | index | archive | help

[-- Attachment #1 --]
On Sat, Aug 13, 2022 at 9:27 AM Kurt Jaeger <pi@freebsd.org> wrote:

> 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
>

Yes. this was adding borgbackup to the previously committed thing....


> > 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!
>

This is creating a new commit with borgbackup...

I'll have to check it out... I'm in need of a good, automated backup...

Warner

[-- 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:27 AM Kurt Jaeger &lt;<a href="mailto:pi@freebsd.org">pi@freebsd.org</a>&gt; 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">Hi!<br>
<br>
&gt; &gt; But if I run a git commit, additional two files turn up:<br>
&gt; &gt; <br>
&gt; &gt; # Changes to be committed:<br>
&gt; &gt; #       modified:   archivers/py-borgbackup/Makefile<br>
&gt; &gt; #       new file:   archivers/py-borgbackup/files/patch-setup.py<br>
&gt; &gt; #       modified:   print/pdf-tools/Makefile<br>
&gt; &gt; #       modified:   print/pdf-tools/distinfo<br>
&gt; &gt; <br>
&gt; &gt; Why isn&#39;t git status not reporting the two pdf-tools files,<br>
&gt; &gt; but git commit is ?<br>
&gt; <br>
&gt; Could you share the &#39;git commit&#39; command-line that you&#39;re using ?<br>
<br>
It was this:<br>
<br>
git commit --amend --author=&#39;Jose G. Juanino &lt;<a href="mailto:jjuanino@gmail.com" target="_blank">jjuanino@gmail.com</a>&gt;&#39; archivers/py-borgbackup<br></blockquote><div><br></div><div>Yes. this was adding borgbackup to the previously committed thing....</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">
&gt; If I&#39;ve to guess then you&#39;re probably including the &#39;-a&#39; switch of git <br>
&gt; commit. If yes, then please don&#39;t include it.<br>
<br>
I now tried this:<br>
<br>
git commit --author=&#39;Jose G. Juanino &lt;<a href="mailto:jjuanino@gmail.com" target="_blank">jjuanino@gmail.com</a>&gt;&#39; archivers/py-borgbackup<br>
<br>
and it worked! Thanks!<br></blockquote><div><br></div><div>This is creating a new commit with borgbackup...</div><div><br></div><div>I&#39;ll have to check it out... I&#39;m in need of a good, automated backup...</div><div><br></div><div>Warner </div></div></div>

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfqwDR3AH%2Bpn76i62GGrrnETskyovRoBzYCAQmQhmZ6w4w>