On Tue, Apr 13, 2010 at 3:28 PM, Kartik Thakore <thakore.kar...@gmail.com> wrote: > > Hi Guillaume, > > I did a git rebase between your master and our redesign branch to make > the new integration branch. And it has your commits > > http://github.com/kthakore/frozen-bubble/commits/integration?page=4
I just tried to clone your repo but it failed twice, strangely: [...@meuh /tmp] git clone http://github.com/kthakore/frozen-bubble.git Initialized empty Git repository in /tmp/frozen-bubble/.git/ got 33a6ea4f461dd2d8834f953ef6b3fc3aadaa7f91 walk 33a6ea4f461dd2d8834f953ef6b3fc3aadaa7f91 got 6769ff9f16dcdb43912582881bc71798293a5557 got c7054d545e46fc52c2afce2acff40ac1926cc0cc got be1de28963fd5e1008f1657415bb2f387eabfc1b walk 6769ff9f16dcdb43912582881bc71798293a5557 walk c7054d545e46fc52c2afce2acff40ac1926cc0cc got c46bc705ef70f9b7d38747fdc7bc1723485296e1 Getting alternates list for http://github.com/kthakore/frozen-bubble.git got b251d7479f36064496bd889c4b35c6af2e5e5eeb got 4a59f6fca793762de9d276efde5c27a83c3e4efb got b8477303446f495e3c3c73d2fecc0f0ee0d59d7d got ab05f0c088aa9ac1101210754bf432dcd1a593ad got 634ce4e8154716125ac1a3dfe4fffe416764a7ba got 60481ee204bae1712fb9843b37cdb0f8b3b0ed0c Getting pack list for http://github.com/kthakore/frozen-bubble.git Getting index for pack 28008b5631a32fe2bd9e6b667da084204bfaecc7 Getting pack 28008b5631a32fe2bd9e6b667da084204bfaecc7 which contains 6a40d6eb282d34233f3fc1088f62dca29ad8254a error: Unable to get pack file http://github.com/kthakore/frozen-bubble.git/objects/pack/pack-28008b5631a32fe2bd9e6b667da084204bfaecc7.pack transfer closed with 49773388 bytes remaining to read error: Unable to find 6a40d6eb282d34233f3fc1088f62dca29ad8254a under http://github.com/kthakore/frozen-bubble.git Cannot obtain needed commit 6a40d6eb282d34233f3fc1088f62dca29ad8254a while processing commit c7054d545e46fc52c2afce2acff40ac1926cc0cc. fatal: Fetch failed. [...@meuh /tmp] git clone http://github.com/kthakore/frozen-bubble.git Initialized empty Git repository in /tmp/frozen-bubble/.git/ got 33a6ea4f461dd2d8834f953ef6b3fc3aadaa7f91 walk 33a6ea4f461dd2d8834f953ef6b3fc3aadaa7f91 got 6769ff9f16dcdb43912582881bc71798293a5557 walk 6769ff9f16dcdb43912582881bc71798293a5557 got c7054d545e46fc52c2afce2acff40ac1926cc0cc got be1de28963fd5e1008f1657415bb2f387eabfc1b walk c7054d545e46fc52c2afce2acff40ac1926cc0cc got c46bc705ef70f9b7d38747fdc7bc1723485296e1 Getting alternates list for http://github.com/kthakore/frozen-bubble.git got b251d7479f36064496bd889c4b35c6af2e5e5eeb got 4a59f6fca793762de9d276efde5c27a83c3e4efb got b8477303446f495e3c3c73d2fecc0f0ee0d59d7d got 634ce4e8154716125ac1a3dfe4fffe416764a7ba got ab05f0c088aa9ac1101210754bf432dcd1a593ad got 60481ee204bae1712fb9843b37cdb0f8b3b0ed0c Getting pack list for http://github.com/kthakore/frozen-bubble.git Getting index for pack 28008b5631a32fe2bd9e6b667da084204bfaecc7 Getting pack 28008b5631a32fe2bd9e6b667da084204bfaecc7 which contains 6a40d6eb282d34233f3fc1088f62dca29ad8254a error: Unable to get pack file http://github.com/kthakore/frozen-bubble.git/objects/pack/pack-28008b5631a32fe2bd9e6b667da084204bfaecc7.pack transfer closed with 49853388 bytes remaining to read error: Unable to find 6a40d6eb282d34233f3fc1088f62dca29ad8254a under http://github.com/kthakore/frozen-bubble.git Cannot obtain needed commit 6a40d6eb282d34233f3fc1088f62dca29ad8254a while processing commit c7054d545e46fc52c2afce2acff40ac1926cc0cc. fatal: Fetch failed. I'll try tomorrow again, maybe that's just github getting mad? For the record, I use git 1.6.4.4 on Linux. In the meantime I have had a random look at some commits. Tobias, about such a commit: http://github.com/kthakore/frozen-bubble/commit/0f86ce221a71d95474648e2442cf3187989b390b first "fixed brokentv effect" isn't very helpful; to my knowledge it worked before so I don't know what was fixed, and as you've commited indentation changes it's not very easy to see what was really done. Usually it's good practice to not change existing indentation level when applying patches :/ even if 8 level is maybe not what everyone likes.. Also "fixed few things" in http://github.com/kthakore/frozen-bubble/commit/7a3a5c4d65ebe2dcc6579509f8533f58d340c84e is not very meaningful either :/ "Fixed pixelize" in http://github.com/kthakore/frozen-bubble/commit/f4cddcbe04ce685d86c172310f2045b7ba58d024 - what was the problem? That's all folks for today :) -- Guillaume Cottenceau - http://zarb.org/~gc/