Re: [boost] [git] The any library does not pull cleanly because of a forced update on develop and master.

Subject: Re: [boost] [git] The any library does not pull cleanly because of a forced update on develop and master.
From: Dave Abrahams (dave_at_[hidden])
Date: 2013-12-10 09:40:23

"Cox, Michael" <mhcox_at_[hidden]> writes:

> I tried to update my local repositories to the latest changes in each
> submodule:
>
>      git pull; git submodule foreach --recursive git pull
>
> When it got to the libs/any submodule, I got the following message:
>
> remote: Counting objects: 27, done.
> remote: Compressing objects: 100% (2/2), done.
> remote: Total 6 (delta 2), reused 6 (delta 2)
> Unpacking objects: 100% (6/6), done.
> From https://github.com/boostorg/any
>  + 3f0b981...e3e5da6 develop    -> origin/develop  (forced update)
>  + 38039b3...d35b2d6 master     -> origin/master  (forced update)
>  * [new tag]         20131209-develop -> 20131209-develop
>  * [new tag]         20131209-master -> 20131209-master
>
> and my editor popped up with a merge commit message to edit.  I think
> that's because the develop and master branches were force updated,
> re-writing history in develop and master.

If there is not already a policy in place to prevent history rewriting
in public branches, we should have one.  And if there's a GitHub
mechanism for denying the privilege, it should be enabled.

-Dave