Re: [Qemu-devel] [PULL 0/2] slirp: move slirp as git submodule project

[Peter Maydell]

On Fri, 3 May 2019 at 16:05, Philippe Mathieu-Daudé <address@hidden> wrote:
> FYI I was running MinGW tests with "make address@hidden
> SHOW_ENV=1 J=8 NETWORK=1" and ran "git pull" to refresh my local repo,
> and got:
>
> $ make address@hidden SHOW_ENV=1 J=8 NETWORK=1
> make[1]: Entering directory '/home/phil/source/qemu'
>   GEN
> /home/phil/source/qemu/docker-src.2019-05-03-16.55.51.7157/qemu.tar
> slirp: unmerged (59a1b1f165458c2acb7ff0525b543945f7416225)
> fatal: git-write-tree: error building trees
> Cannot save the current index state
> Cloning into
> '/home/phil/source/qemu/docker-src.2019-05-03-16.55.51.7157/qemu.tar.vroot'...
> done.
> error: pathspec 'slirp:' did not match any file(s) known to git.
> error: pathspec 'needs' did not match any file(s) known to git.
> error: pathspec 'merge' did not match any file(s) known to git.
> failed to checkout slirp: needs merge revision
> tar: /var/tmp/qemu/qemu.tar: Cannot open: No such file or directory
> tar: Error is not recoverable: exiting now
> Failed to untar source
> tests/docker/Makefile.include:203: recipe for target 'docker-run' failed
> make[1]: *** [docker-run] Error 1

This weird set of errors is demonstrating a bug in
scripts/archive-source.sh where it is not checking
for errors from git. Specifically it does:

if git diff-index --quiet HEAD -- &>/dev/null
then
    HEAD=HEAD
else
    HEAD=$(git stash create)
fi

and git prints "slirp: needs merge revision", which we
blindly put into the HEAD variable, and then later do:

git checkout $HEAD

which is what's causing the weird pathspec errors, because
(a) we're trying to check out an error message and (b) our
shell quoting is nonexistent and so we don't even treat it
as a single argument...

thanks
-- PMM