retitle 720896 Poor error message for non-fast-forwarding push
thanks
Joey Hess writes ("Bug#720896: git: failed command: git merge-base
refs/remotes/dgit/dgit/sid HEAD"):
> I am trying to release alien using dgit. In a clone of the upstream
> git repository, I ran `dgit fetch`, which added the dgit repository
> correctly. Then still in my upstream master branch, I did a
> `dgit build -tc`, which succeeded. Then `dgit push` failed:
...
> git: failed command: git merge-base refs/remotes/dgit/dgit/sid HEAD
> dgit: subprocess failed with error exit status 1
> - exit 1
This error message isn't very good.
> So it seems dgit wants the HEAD when pushing to be connected to the dgit/sid
> branch. However, dgit fetch did not do that. I can (and now have) done it
> on my own[1], but I wonder if a) this requirement makes sense and b) should
> fetch do it automatically?
Yes. dgit fetch doesn't do that. Maybe you wanted dgit pull.
The requirement that the dgit history is fast-forwarding is mentioned
several times in the manpage.
In principle there is no need for that to be true for dgit to work,
but I had to make a choice between two possible gitish views of the
world. I chose the one that makes the workflow "dgit pull; edit; dgit
push" work.
Ian.
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
