Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 13 Aug 2022 11:54:22 +0200
From:      Kurt Jaeger <pi@freebsd.org>
To:        freebsd-git@freebsd.org
Subject:   git wants to commit more files than expected ?
Message-ID:  <Yvd0ziIpQpZTjVyd@fc.opsec.eu>

next in thread | raw e-mail | index | archive | help
Hi!

I'm trying to commit the fix from

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=265060

and run into trouble. I have a probably pristine git repo:

$ git remote -v
freebsd https://git.freebsd.org/ports.git (fetch)
freebsd https://git.freebsd.org/ports.git (push)

$ git status 
On branch main
Your branch is up to date with 'freebsd/main'.

Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        modified:   archivers/py-borgbackup/Makefile
        new file:   archivers/py-borgbackup/files/patch-setup.py

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 ?

How do I get rid of the two pdf-tools changes ? I'm not aware that I ever
changed those files!

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



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