07:58:57 (UTC) Begin LilyPond compile, previous commit at c0a691181c981f55ef28e5daa8410b41e37ef808 07:59:10 *** FAILED STEP *** merge from staging Command '['git', 'fetch']' returned non-zero exit status 1 error: unable to resolve reference refs/remotes/origin/dev/janek/experimental-fix-for-issue-2462: Not a directory >From ssh://git.sv.gnu.org/srv/git/lilypond ! [new branch] dev/janek/experimental-fix-for-issue-2462 -> origin/dev/janek/experimental-fix-for-issue-2462 (unable to update local ref) error: unable to resolve reference refs/remotes/origin/dev/janek/experimental-fix-for-issue-2658: Not a directory ! [new branch] dev/janek/experimental-fix-for-issue-2658 -> origin/dev/janek/experimental-fix-for-issue-2658 (unable to update local ref) error: unable to resolve reference refs/remotes/origin/dev/janek/feta-modification: Not a directory ! [new branch] dev/janek/feta-modification -> origin/dev/janek/feta-modification (unable to update local ref) error: some local refs could not be updated; try running 'git remote prune origin' to remove any old, conflicting branches 07:59:10 Traceback (most recent call last): File "/home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py", line 497, in merge_branch self.merge_git_branch (branch, **kwargs) File "/home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py", line 423, in merge_git_branch self.update_git () File "/home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py", line 233, in update_git run ("git fetch") File "/home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py", line 105, in run raise FailedCommand ("Command '%s' returned non-zero exit status %d\n%s" % (cmd, returncode, stderr.strip ())) FailedCommand: Command '['git', 'fetch']' returned non-zero exit status 1 error: unable to resolve reference refs/remotes/origin/dev/janek/experimental-fix-for-issue-2462: Not a directory >From ssh://git.sv.gnu.org/srv/git/lilypond ! [new branch] dev/janek/experimental-fix-for-issue-2462 -> origin/dev/janek/experimental-fix-for-issue-2462 (unable to update local ref) error: unable to resolve reference refs/remotes/origin/dev/janek/experimental-fix-for-issue-2658: Not a directory ! [new branch] dev/janek/experimental-fix-for-issue-2658 -> origin/dev/janek/experimental-fix-for-issue-2658 (unable to update local ref) error: unable to resolve reference refs/remotes/origin/dev/janek/feta-modification: Not a directory ! [new branch] dev/janek/feta-modification -> origin/dev/janek/feta-modification (unable to update local ref) error: some local refs could not be updated; try running 'git remote prune origin' to remove any old, conflicting branches
_______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel