OSC / ood-fileexplorer

[MOVED] The Open OnDemand File Explorer
https://osc.github.io/Open-OnDemand/
MIT License
4 stars 1 forks source link

Merge cloudcmd with history #181

Closed ericfranz closed 5 years ago

ericfranz commented 5 years ago

Added by running these commands:

Deleted old lib/cloudcmd with no history:

git clone git@github.com:OSC/ood-fileexplorer.git
cd ood-fileexplorer
git checkout merge_cloudcmd
git rm lib -r
gc -m "delete cloudcmd without history"

Add new lib/cloudcmd with limited history (back to the fork):

git remote add cloudcmd git@github.com:OSC/cloudcmd.git
git fetch cloudcmd --no-tags
git checkout -b cloudcmd --track cloudcmd/ondemand-cloudcmd-monorepo
git checkout merge_cloudcmd_with_history
git merge cloudcmd --allow-unrelated-histories

To see the creation of that fork, I did this on https://github.com/OSC/cloudcmd:

git clone git@github.com:OSC/cloudcmd.git
cd cloudcmd
git checkout --orphan ondemand-cloudcmd a6a10be4
git commit -m "fork https://github.com/coderaiser/cloudcmd 5.3.1"
git rebase -X theirs --onto ondemand-cloudcmd a6a10be4 8423b15d87e7680df124155ed5fe7cb043e025dd
git update-ref refs/heads/ondemand-cloudcmd HEAD
git checkout ondemand-cloudcmd

I confirmed the resulting lib/cloudcmd is identical to the original so this PR should be safe to merge.

ericfranz commented 5 years ago

@AriettaZ figured you could review this while I am looking at your work Friday morning.

ericfranz commented 5 years ago

Though there is probably not much to review except maybe to test? Or test after merge back into your branch.