<div dir="ltr"><div><div>Hello,<br><br></div>thanks for reporting this. As discussed on irc, I have cherry picked and pushed the missing commits, I'm now releasing 0.101.5.<br><br></div>It's not really clear to me how it happened. Looking at the buildbot logs, pull started breaking after my 0.101.4 commit, but looking at my bash history I was just doing "git push" and "git push --tags". I have no idea how that could have rewrote the history.<br>
</div><div class="gmail_extra"><br><br><div class="gmail_quote">On 12 March 2014 17:51, Martin Abente <span dir="ltr"><<a href="mailto:martin.abente.lahaye@gmail.com" target="_blank">martin.abente.lahaye@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><pre style="word-wrap:break-word"><font color="#000000"><span style="white-space:pre-wrap">Hello everyone,

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

    [tch@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://<a href="http://github.com/sugarlabs/sugar" target="_blank">github.com/sugarlabs/sugar</a>
     + eed15fe...88ed846 master     -> origin/master  (forced update)
     * [new tag]         v0.101.4   -> v0.101.4
    Merge made by the 'recursive' strategy.
     <a href="http://configure.ac" target="_blank">configure.ac</a> | 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)?</span></font></pre><pre style="word-wrap:break-word"><font color="#000000"><span style="white-space:pre-wrap">Other ideas?</span></font></pre>

<pre style="word-wrap:break-word">tch.</pre><pre style="word-wrap:break-word"><font color="#000000"><span style="white-space:pre-wrap">Refs:
1. <a href="https://github.com/sugarlabs/sugar" target="_blank">https://github.com/sugarlabs/sugar</a>
2. <a href="https://github.com/sugarlabs/sugar/pull/261" target="_blank">https://github.com/sugarlabs/sugar/pull/261</a>
3. <a href="https://github.com/sugarlabs/sugar/pull/265" target="_blank">https://github.com/sugarlabs/sugar/pull/265</a>
4. <a href="https://github.com/sugarlabs/sugar/pull/266" target="_blank">https://github.com/sugarlabs/sugar/pull/266</a>
5. <a href="https://github.com/sugarlabs/sugar/pull/267" target="_blank">https://github.com/sugarlabs/sugar/pull/267</a></span></font></pre></div>
<br>_______________________________________________<br>
Sugar-devel mailing list<br>
<a href="mailto:Sugar-devel@lists.sugarlabs.org">Sugar-devel@lists.sugarlabs.org</a><br>
<a href="http://lists.sugarlabs.org/listinfo/sugar-devel" target="_blank">http://lists.sugarlabs.org/listinfo/sugar-devel</a><br>
<br></blockquote></div><br><br clear="all"><br>-- <br>Daniel Narvaez<br>
</div>