[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Fwd: LilyPond | Pipeline #166542826 has failed for dev/harm/duration
Re: Fwd: LilyPond | Pipeline #166542826 has failed for dev/harm/duration-line | ddec74be in !249
Wed, 15 Jul 2020 00:59:50 +0200
Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux)
Thomas Morley <email@example.com> writes:
> Am Mi., 15. Juli 2020 um 00:15 Uhr schrieb David Kastrup <firstname.lastname@example.org>:
>> Thomas Morley <email@example.com> writes:
>> > Am Di., 14. Juli 2020 um 22:14 Uhr schrieb Thomas Morley
>> > <firstname.lastname@example.org>:
>> >> Am Di., 14. Juli 2020 um 22:03 Uhr schrieb Jonas Hahnfeld
>> >> <email@example.com>:
>> >> > Did you run a full 'make test' locally and it passed?
>> >> I thought so. Will check/redo...
>> >> Thanks,
>> >> Harm
>> > Ok, the culprit was: after doing successfully all local tests, I added
>> > something, which I supposed to be trivial. It wasn't.
>> > Should be fixed now. make test succeeds.
>> > What's the command line syntax to upload a fixed patch?
>> > First upload I did with
>> > git push -o merge_request.create -o merge_request.title="My patch" -o
>> > merge_request.remove_source_branch origin HEAD:my-proposed-branch-name
>> > Doing the same for the fix sounds wrong.
>> Just push without any options (by the way, when not using
>> merge_request.title, the title is just picked off the headline of the
>> commit) to the same branch. Since you likely have amended your commit
>> instead of adding one on top, this will not be a fast forward push, so
>> you'll need the -f option or use +HEAD:my-proposed-branch-name as
>> source:target description. It's the same requirement as you'd have
>> after rebasing.
>> David Kastrup
> I indeed amended the patch.
> Would it then be:
> git push -f origin HEAD:dev/harm/duration-line