[Sugar-devel] Weirdness in sugar git repository

[Martin Abente]

Hello everyone,

Today I pulled the latest bits from our sugar [1] repo and saw this:

    [tch at tch sugar]$ git pull
    remote: Counting objects: 3, done.
    remote: Compressing objects: 100% (3/3), done.
    remote: Total 3 (delta 0), reused 0 (delta 0)
    Unpacking objects: 100% (3/3), done.
    From git://github.com/sugarlabs/sugar
     + eed15fe...88ed846 master     -> origin/master  (forced update)
     * [new tag]         v0.101.4   -> v0.101.4
    Merge made by the 'recursive' strategy.
     configure.ac | 2 +-
     1 file changed, 1 insertion(+), 1 deletion(-)

That didn't look right to me, so I also checked some of the pull
requests and noticed that most [2,3,4,5] of our pull requests have a
lot commits that weren't there before.

Could it be that someone changed the history at some point (ie., using --force)?

Other ideas?

tch.

Refs:
1. https://github.com/sugarlabs/sugar
2. https://github.com/sugarlabs/sugar/pull/261
3. https://github.com/sugarlabs/sugar/pull/265
4. https://github.com/sugarlabs/sugar/pull/266
5. https://github.com/sugarlabs/sugar/pull/267
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sugarlabs.org/archive/sugar-devel/attachments/20140312/86701aa4/attachment.html>