Re: Makefile has local changes that will be overwritten

[Programmingkid <programmingkidx@gmail.com>]

> On Feb 1, 2021, at 9:52 AM, Peter Maydell <peter.maydell@linaro.org> wrote:
> 
> On Mon, 1 Feb 2021 at 14:49, Dan Streetman <ddstreet@canonical.com> wrote:
>> 
>> On Mon, Feb 1, 2021 at 9:23 AM Programmingkid <programmingkidx@gmail.com> wrote:
>>> 
>>> When trying to build QEMU I see this error:
>>> 
>>> error: Your local changes to the following files would be overwritten by checkout:
>>>        Makefile
>>> Please commit your changes or stash them before you switch branches.
>>> Aborting
>>> 
>>> What I do to see this error:
>>> ./configure --target-list=i386-softmmu
>> 
>> Sorry, I don't see that error, what commit are you building from?
> 
> ...and what does git think the local changes to Makefile are ?

This is the output of 'git status':
On branch master
Your branch is up to date with 'origin/master'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
  (commit or discard the untracked or modified content in submodules)
	modified:   dtc (new commits, modified content)

Untracked files:
  (use "git add <file>..." to include in what will be committed)
	pixman/

no changes added to commit (use "git add" and/or "git commit -a")


This is the output of 'git diff master':
diff --git a/dtc b/dtc
index 85e5d83984..88f18909db 160000
--- a/dtc
+++ b/dtc
@@ -1 +1 @@
-Subproject commit 85e5d839847af54efab170f2b1331b2a6421e647
+Subproject commit 88f18909db731a627456f26d779445f84e449536-dirty

I have tried 'git clean -d -f', 'git reset --hard' and 'git pull'. I am now at 74208cd252c5da9d867270a178799abd802b9338 and still seeing the error with MakeFile.