Messed up commit in master

Messed up commit in master

[Lucas Stach]

Hi Sascha,

I've just stumbled across a messed up commit that landed in barebox
master. It seems you squashed other unrelated commits into commit
e7a8519963fcb235a123dfe5e7dd59d6fb2eaf9e (ARM: mx6sx-sabresdb: set
proper hostname).

I know its against the master stability rules, but I think it would be
justified to split this commit properly and re-push a fixed master.

Regards,
Lucas
-- 
Pengutronix e.K.             | Lucas Stach                 |
Industrial Linux Solutions   | http://www.pengutronix.de/  |


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: Messed up commit in master

[Sascha Hauer]

On Tue, Dec 08, 2015 at 04:58:22PM +0100, Lucas Stach wrote:
> Hi Sascha,
> 
> I've just stumbled across a messed up commit that landed in barebox
> master. It seems you squashed other unrelated commits into commit
> e7a8519963fcb235a123dfe5e7dd59d6fb2eaf9e (ARM: mx6sx-sabresdb: set
> proper hostname).
> 
> I know its against the master stability rules, but I think it would be
> justified to split this commit properly and re-push a fixed master.

I messed it up, but unfortunately we have to live with it. I won't
rebase master. In the end nothing bad has happened, only that one commit
has the wrong commit message.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox