[U-Boot] Attn Maintainers: git advise needed (how to fix messed up repo)

[Graeme Russ]

Hi Mike,

On Tue, Nov 29, 2011 at 10:02 AM, Mike Frysinger <vapier at gentoo.org> wrote:
> On Monday 28 November 2011 17:31:19 Graeme Russ wrote:
>> error: refs/tags/2009.01-rc2 does not point to a valid object!
>
> this tag seems to have bled into some people's repos ... i'd suggest you punt
> it locally:
>        git tag -d 2009.01-rc2
> and then punt it remotely:
>        git push <remote_uri> :2009.01-rc2

Ah, thanks

>
>> $ git fetch u-boot
>> ...
>> $ git rebase u-boot/master
>> ...
>> $ git push ssh://gu-x86@git.denx.de/u-boot-x86
>> ...
>> To ssh://gu-x86@git.denx.de/u-boot-x86
>>  ! [rejected]        master -> master (non-fast-forward)
>
> well, you did a rebase, so this is kind of par for the course.  use --force to
> rewrite the published branch.

So how do you keep the sub-repo up-to-date with u-boot/master without
doing forced pushes?

Regards,

Graeme