* Git pull and untracked files
@ 2020-06-28 18:30 Gautam Bhat
2020-06-29 0:02 ` Valdis Klētnieks
2020-06-29 0:15 ` Valdis Klētnieks
0 siblings, 2 replies; 4+ messages in thread
From: Gautam Bhat @ 2020-06-28 18:30 UTC (permalink / raw)
To: kernelnewbies
Hi,
When I do a git pull to get the latest changes (from v5.2) , git
status shows the following files as untracked:
scripts/conmakehash
scripts/pnmtologo
scripts/sortextable
I don't see the files in .gitignore too but in the earlier version
i.e. v5.2 it is present. These files are binaries, should I go ahead
and delete them?
-Gautam.
_______________________________________________
Kernelnewbies mailing list
Kernelnewbies@kernelnewbies.org
https://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Git pull and untracked files
2020-06-28 18:30 Git pull and untracked files Gautam Bhat
@ 2020-06-29 0:02 ` Valdis Klētnieks
2020-06-29 0:15 ` Valdis Klētnieks
1 sibling, 0 replies; 4+ messages in thread
From: Valdis Klētnieks @ 2020-06-29 0:02 UTC (permalink / raw)
To: Gautam Bhat; +Cc: kernelnewbies
[-- Attachment #1.1: Type: text/plain, Size: 1442 bytes --]
On Mon, 29 Jun 2020 00:00:23 +0530, Gautam Bhat said:
> scripts/conmakehash
> scripts/pnmtologo
> scripts/sortextable
>
> I don't see the files in .gitignore too but in the earlier version
> i.e. v5.2 it is present. These files are binaries, should I go ahead
> and delete them?
Looks like two were moved and one was renamed, so feel free to nuke the copy
that's in scripts/
commit 4484aa800ac588a1fe2175cd53076c21067f44b4
Author: Masahiro Yamada <masahiroy@kernel.org>
Date: Tue Dec 17 20:06:33 2019 +0900
tty: vt: move conmakehash to drivers/tty/vt/ from scripts/
scripts/conmakehash is only used for generating
drivers/tty/vt/consolemap_deftbl.c
Move it to the related directory.
commit 78a20a012ecea857e438b1f9e8091acb290bd0f5
Author: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Wed Aug 21 13:12:37 2019 +0900
video/logo: move pnmtologo tool to drivers/video/logo/ from scripts/
This tool is only used by drivers/video/logo/Makefile. No reason to
keep it in scripts/.
commit 1091670637be8bd34a39dd1ddcc0a10a7c88d4e2
Author: Shile Zhang <shile.zhang@linux.alibaba.com>
Date: Wed Dec 4 08:46:31 2019 +0800
scripts/sorttable: Rename 'sortextable' to 'sorttable'
Use a more generic name for additional table sorting usecases,
such as the upcoming ORC table sorting feature. This tool is
not tied to exception table sorting anymore.
No functional changes intended.
[-- Attachment #1.2: Type: application/pgp-signature, Size: 832 bytes --]
[-- Attachment #2: Type: text/plain, Size: 170 bytes --]
_______________________________________________
Kernelnewbies mailing list
Kernelnewbies@kernelnewbies.org
https://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Git pull and untracked files
2020-06-28 18:30 Git pull and untracked files Gautam Bhat
2020-06-29 0:02 ` Valdis Klētnieks
@ 2020-06-29 0:15 ` Valdis Klētnieks
2020-07-05 15:08 ` Gautam Bhat
1 sibling, 1 reply; 4+ messages in thread
From: Valdis Klētnieks @ 2020-06-29 0:15 UTC (permalink / raw)
To: Gautam Bhat; +Cc: kernelnewbies
[-- Attachment #1.1: Type: text/plain, Size: 772 bytes --]
On Mon, 29 Jun 2020 00:00:23 +0530, Gautam Bhat said:
> Hi,
>
> When I do a git pull to get the latest changes (from v5.2) , git
> status shows the following files as untracked:
>
> scripts/conmakehash
> scripts/pnmtologo
> scripts/sortextable
>
> I don't see the files in .gitignore too but in the earlier version
> i.e. v5.2 it is present. These files are binaries, should I go ahead
> and delete them?
And to add to my reply: How to figure this out for yourself since
you already have a git tree...
For the first two, I did a 'git grep conmakehash', which told me it was
in a different Makefile. 'git blame drivers/tty/vt/Makefile | grep conmakehash'
popped out the commit for 'git show'...
The last one I had to resort to 'git log | grep -B30 sortextable | more'
[-- Attachment #1.2: Type: application/pgp-signature, Size: 832 bytes --]
[-- Attachment #2: Type: text/plain, Size: 170 bytes --]
_______________________________________________
Kernelnewbies mailing list
Kernelnewbies@kernelnewbies.org
https://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Git pull and untracked files
2020-06-29 0:15 ` Valdis Klētnieks
@ 2020-07-05 15:08 ` Gautam Bhat
0 siblings, 0 replies; 4+ messages in thread
From: Gautam Bhat @ 2020-07-05 15:08 UTC (permalink / raw)
To: Valdis Klētnieks; +Cc: kernelnewbies
Thanks! That is helpful.
-Gautam.
On Mon, Jun 29, 2020 at 5:45 AM Valdis Klētnieks
<valdis.kletnieks@vt.edu> wrote:
>
> On Mon, 29 Jun 2020 00:00:23 +0530, Gautam Bhat said:
> > Hi,
> >
> > When I do a git pull to get the latest changes (from v5.2) , git
> > status shows the following files as untracked:
> >
> > scripts/conmakehash
> > scripts/pnmtologo
> > scripts/sortextable
> >
> > I don't see the files in .gitignore too but in the earlier version
> > i.e. v5.2 it is present. These files are binaries, should I go ahead
> > and delete them?
>
> And to add to my reply: How to figure this out for yourself since
> you already have a git tree...
>
> For the first two, I did a 'git grep conmakehash', which told me it was
> in a different Makefile. 'git blame drivers/tty/vt/Makefile | grep conmakehash'
> popped out the commit for 'git show'...
>
> The last one I had to resort to 'git log | grep -B30 sortextable | more'
_______________________________________________
Kernelnewbies mailing list
Kernelnewbies@kernelnewbies.org
https://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-07-05 15:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-28 18:30 Git pull and untracked files Gautam Bhat
2020-06-29 0:02 ` Valdis Klētnieks
2020-06-29 0:15 ` Valdis Klētnieks
2020-07-05 15:08 ` Gautam Bhat
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).