Re: [Lilypond-auto] Patchy email

[John Mandereau]

Hi James,
> 09:24:02 (UTC) Begin LilyPond compile, previous commit at       
> d14e4770b85b3cacc647e45b9ebfe59cc085753f
> 09:24:07 Merged staging, now at:        
> d14e4770b85b3cacc647e45b9ebfe59cc085753f
> 09:24:08        Success:                ./autogen.sh --noconfigure
> 09:24:18        Success:                ../configure --disable-optimising
> 09:24:24        Success:                nice make clean
> 09:25:34        Success:                nice make -j7 CPU_COUNT=7
> 09:27:51        Success:                nice make test -j7 CPU_COUNT=7
> 09:44:13        Success:                nice make doc -j7 CPU_COUNT=7
> 09:44:17 *** FAILED STEP ***
>         merge from staging
>         Command '['git', 'log', '-1', 'origin/HEAD..test-staging']' returned 
> non-zero exit status 128
> fatal: ambiguous argument 'origin/HEAD..test-staging': unknown revision or 
> path not in the working tree.
> Use '--' to separate paths from revisions

I suppose that your $LILYPOND_GIT git repository has fetch settings
that differ from ours, so you got this error, and in addition I guess
that master and HEAD should always be equal on Savannah LilyPond git
repo.  Could please you help me with verifying the first guess by
answering the following?

1) What does

cd $LILYPOND_GIT
git rev-parse origin/HEAD

say?

2) What does the [remote "origin"] section of $LILYPOND_GIT/.git/config contain?

3) What does lilypond-patchy-staging say (complete console output) if
you replace line 334 of patches/compile_lilypond_test/__init__.py

origin_head = remote_branch_name ("HEAD")

with

origin_head = remote_branch_name ("master")

?

(In case after the change lilypond-patchy-staging says "No new
commits", clear the value of last_known_good_build in [staging]
section of ~/.lilypond-patchy-config and rerun
lilypond-patchy-staging).

Thanks,
John