| Subject: | CommitBuild plugin creating commits without a parent |
I'm using the CommitBuild plugin in the following manner:
; Save (only) release builds to the repository.
[Git::CommitBuild]
branch =
release_branch = releases
release_message = build results of %h (on %b)
This worked flawlessly for me during the first few releases of my code,
but then something went wrong and ever since that time, I have this
problem:
*** Preparing to release Finance-Bank-Bankwest-1.2.1.tar.gz with UploadToCPAN ***
Do you want to continue the release process? [y/N]: y
PAUSE username: LXP
PAUSE password:
[UploadToCPAN] registering upload with PAUSE web server
[UploadToCPAN] POSTing upload for Finance-Bank-Bankwest-1.2.1.tar.gz to https://pause.perl.org/pause/authenquery
[UploadToCPAN] PAUSE add message sent ok [200]
[Git::Commit] Committed Changes dist.ini README.pod
[Git::Push] pushing to origin
Username for 'https://github.com': lx
Password for 'https://lx@github.com':
To https://github.com/Lx/perl5-Finance-Bank-Bankwest.git
60b597a..8623bc1 master -> master
! [rejected] releases -> releases (non-fast-forward)
error: failed to push some refs to 'https://github.com/Lx/perl5-Finance-Bank-Bankwest.git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. If you did not intend to push that branch, you may want to
hint: specify branches to push or set the 'push.default' configuration
hint: variable to 'current' or 'upstream' to push only the current branch.
Opening my local repository up in gitk shows that the release was
successfully committed, but has no parent. I've had to manually
re-parent the commits each time, except now I've done something wrong
and GitHub is not showing commits for previous releases despite them
existing in my local repository and "git push" reporting that everything
is "up-to-date."
As a result of this failure, my releases are also not getting tagged in
the repository.
I acknowledge that the "hint" in the error message above indicates a
discrepancy between remote and local branch tips, but gitk shows that
this is not actually the case.
I've tried deleting my local repository and re-cloning, but the problem
persists on subsequent releases.
Any assistance in resolving this matter will be very gratefully
received.
Additionally, any assistance in restoring my full release commit history
on GitHub would also be welcomed (if there are any obvious solutions).