| Message ID | 20180729212744.23709-2-lbloch@janustech.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | qcow2: Make the L2 cache cover the whole image by default | expand |
On 07/29/2018 04:27 PM, Leonid Bloch wrote: > Adds /roms/vgabios to .gitignore - this directory appears after the > build, and was not ignored by Git so far. > Actually, that's the directories for one of the submodules. It seems fishy to have a directory listed in both .gitignore and .gitmodules at the same time, so I'm inclined to NACK this patch, and instead figure out what in the build is dirtying the directory when the submodule is not checked out. > Signed-off-by: Leonid Bloch <lbloch@janustech.com> > --- > .gitignore | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/.gitignore b/.gitignore > index 5668d02782..2b3b30ae9f 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -212,3 +212,4 @@ trace-dtrace-root.dtrace > trace-ust-all.h > trace-ust-all.c > /target/arm/decode-sve.inc.c > +/roms/vgabios >
On 07/30/2018 10:40 AM, Eric Blake wrote: > On 07/29/2018 04:27 PM, Leonid Bloch wrote: >> Adds /roms/vgabios to .gitignore - this directory appears after the >> build, and was not ignored by Git so far. >> > > Actually, that's the directories for one of the submodules. It seems > fishy to have a directory listed in both .gitignore and .gitmodules at > the same time, so I'm inclined to NACK this patch, and instead figure > out what in the build is dirtying the directory when the submodule is > not checked out. Or rather, it was a submodule until commit 91b8eba9. So maybe what's happening is that you previously had it checked out, and now that we no longer have the submodule, it shows up unless .gitconfig ignores it. For that, I'd recommend editing .git/info/exclude to ignore it locally (if you plan on frequently checking out points both before and after the deletion) rather than making it part of upstream (which tends to focus more on ignoring files built by the current contents of master, not files that are leftovers from earlier commits).
diff --git a/.gitignore b/.gitignore index 5668d02782..2b3b30ae9f 100644 --- a/.gitignore +++ b/.gitignore @@ -212,3 +212,4 @@ trace-dtrace-root.dtrace trace-ust-all.h trace-ust-all.c /target/arm/decode-sve.inc.c +/roms/vgabios
Adds /roms/vgabios to .gitignore - this directory appears after the build, and was not ignored by Git so far. Signed-off-by: Leonid Bloch <lbloch@janustech.com> --- .gitignore | 1 + 1 file changed, 1 insertion(+)