> Okay. I think that this is a bug, but I don't know how to reproduce it
> yet.
> Do you have an upstream remote pointing to Joey's repository?
[remote "upstream"]
url = /usr/src/propellor/propellor.git
fetch = +refs/heads/*:refs/remotes/upstream/*
> Please run propellor with PROPELLOR_DEBUG=1 so we can see the commands
> it runs to set up the upstream/master branch.
picca@mordor:~$ PROPELLOR_DEBUG=1 propellor
** warning: ** Your ~/.propellor/ is out of date..
A newer upstream version is available in /usr/src/propellor/propellor.git
To merge it, run: git merge upstream/master
[2017-08-19 08:39:07 CEST] read: hostname ["-f"]
[2017-08-19 08:39:07 CEST] process done ExitSuccess
[2017-08-19 08:39:07 CEST] command line: Run "mordor"
[2017-08-19 08:39:07 CEST] read: git ["remote"]
[2017-08-19 08:39:07 CEST] process done ExitSuccess
[2017-08-19 08:39:07 CEST] read: git ["symbolic-ref","--short","HEAD"]
[2017-08-19 08:39:07 CEST] process done ExitSuccess
[2017-08-19 08:39:07 CEST] call: git ["fetch"]
Enter passphrase for key '/home/picca/.ssh/id_rsa':
In fact this where I do not understand.
When I do the merge, I use to do only plain git commant as explained by
propellor
git merge upstream/master
--
Sean Whitton
