|
From: | Eric Blake |
Subject: | Re: [Qemu-devel] [PATCH 1/6 for-3.0] Update .gitignore |
Date: | Mon, 30 Jul 2018 10:43:30 -0500 |
User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 |
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).
-- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
[Prev in Thread] | Current Thread | [Next in Thread] |