Hi everyone, We removed the binaries that got accidentally added to the master branch. This required to partially rewrite the history, affecting all commits after 229c1c5.
What does this mean for you? First of all, if you haven't yet pulled beyond 229c1c5 you can stop reading and pull whenever you like. If you pulled beyond that, read on... Important: don't just pull or git will merge your local master branch with the rewritten one from upstream - you don't want that. Just Read on... Option 1) In case you have no local/custom branches or commits in your clone of the repo I recommend to just delete your local copy and just clone it again. Option 2) In case a full re-clone isn't feasible in your case you might do the following while on the master branch (read the WARNING below!): - git reset --hard 229c1c5 - git pull - git reflog expire --expire=all --expire-unreachable=all --all - git gc --aggressive --prune=all WARNING: the above will remove all affected commits from your local master branch, including those you might have committed locally after your last pull! Be sure to save (i.e. cherry-pick) them to another branch for backup purposes. This will also discard any uncommitted changes you have in the index (staged for commit) or in the working tree. Use "git stash" to save them before you run the above! If your case is more complex and you're not sure what to do, please ask and we'll try to help. Best, Oliver On 04/12/13 16:49 , Juha wrote: > Hi guys > > ipch > files<http://boinc.berkeley.edu/gitweb/?p=boinc-v2.git;a=tree;f=win_build/ipch;h=08170542576b183c2e4aa993eca34cee3ad062db;hb=2f44890b0a9d7ebf05ffd74068af1f2ab712e76d> > build > files<http://boinc.berkeley.edu/gitweb/?p=boinc-v2.git;a=tree;f=win_build/installerv2/redist/Windows/src/boinccas/Release;h=3c9472b71c4a0f0342a46bf943744353eb6306df;hb=2f44890b0a9d7ebf05ffd74068af1f2ab712e76d> > more build > files<http://boinc.berkeley.edu/gitweb/?p=boinc-v2.git;a=tree;f=win_build/installerv2/redist/Windows/src/boinccas/Release95;h=6659dc0dd3cd4d369a4be4ced8a0ac754140ed21;hb=2f44890b0a9d7ebf05ffd74068af1f2ab712e76d> > even more build > files<http://boinc.berkeley.edu/gitweb/?p=boinc-v2.git;a=tree;f=win_build/installerv2/redist/Windows/src/boinccas/x64/Release;h=33eefb3181efc949a8a26ea54263562da20879a1;hb=2f44890b0a9d7ebf05ffd74068af1f2ab712e76d> > > Rom already removed the files from master. However, the files are still in > the repo history. > > The total size of the files is about 590 MB. I suppose most of the files > compress reasonably well (the files are stored compressed in history, > right?) but it's still going to be quite a lot compared to rest of the repo > (around 150-200 MB I think). > > Are you going to purge the files from history? > > -Juha > _______________________________________________ > boinc_dev mailing list > boinc_dev@ssl.berkeley.edu > http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev > To unsubscribe, visit the above URL and > (near bottom of page) enter your email address. >
smime.p7s
Description: S/MIME Cryptographic Signature
_______________________________________________ boinc_dev mailing list boinc_dev@ssl.berkeley.edu http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev To unsubscribe, visit the above URL and (near bottom of page) enter your email address.
