git - Detach subdirectory (that was renamed!) into a new repo -



git - Detach subdirectory (that was renamed!) into a new repo -

i have repository , detach 1 of directories new repo. this perfect place started, there 1 caveat, however: directory want detach renamed @ point. , if follow solution post new name of directory seems i'm loosing history before re-name. ideas of tweak create work in situation?

git filter-branch can operate on ranges of commits; can filter 'before' , 'after' separately, , utilize grafts tack them together:

git branch rename $commit_id_of_rename git branch pre-rename rename~ ## first filter commits rename, not rename git filter-branch --subdirectory-filter $oldname pre-rename ## add together graft, our rename rev comes after processed pre-rename revs echo `git rev-parse rename` `git rev-parse pre-rename` >> .git/info/grafts ## first filter-branch left refs backup directory. move away ## next filter-branch doesn't complain mv .git/refs/original .git/refs/original0 ## filter rest git filter-branch --subdirectory-filter $newname master ^pre-rename ## graft baked branch, don't need anymore rm .git/info/grafts

this marginally more complex if need filter multiple branches or tags; branches before rename can included first filter-branch, while ones after must included before ^rename in sec filter-branch.

another alternative add together index filter (or tree filter) instead checks both directories, old , new, , keeps whichever present.

since haven't provided test repository, here's quick sanity-check script scenario:

#!/bin/bash set -u set -e set -x rm -rf .git x y foo git init mkdir x echo initial > x/foo git add together x/foo git commit -m 'test commit 1' echo tc2 >> x/foo git commit -a -m 'test commit 2' mv x y git rm x/foo git add together y/foo git commit -a -m 'test rename' git branch rename head echo post rename >> y/foo git commit -a -m 'test post rename' git branch pre-rename rename~ git filter-branch --subdirectory-filter x pre-rename echo `git rev-parse rename` `git rev-parse pre-rename` >> .git/info/grafts mv .git/refs/original .git/refs/original0 git filter-branch --subdirectory-filter y master ^pre-rename rm .git/info/grafts git log -u

if procedure not work you, there else odd repository history haven't described, such rename hiding in history.

git git-filter-branch

Comments

Post a Comment

Popular posts from this blog

iphone - Dismissing a UIAlertView -

iphone - Dismissing a UIAlertView - i set in app purchase app, , when user taps button, purchase started. basically, tap button, , depending on speed on net connection, waiting 10 seconds until new alert view comes asking if purchase product. user tap button multiple times since nil came up, , multiple purchase alert views come up. additionally, maybe seen user app bug. in end, problem. i want alert view come spinning wheel says "loading..." when users taps purchase button. problem is, how dismiss when new alert view comes asking user if want purchase product? if ([uialertview alloc] says: @"whatever apple's alert view says") { //dismiss "loading..." alert view here } i uncertainty work, input appreciated. thanks! you need have access alertview. can this. create alertview instance var in app delegate , when want show loading initialize instance var assign property , when want dismiss phone call [alertviewinstance d...
Read more

c# - Can ProtoBuf-Net deserialize to a flat class? -

c# - Can ProtoBuf-Net deserialize to a flat class? - protobuf-net uses nested protobuf constructs back upwards inheritance. however, can made force properties flat target class has same properties inherited "serialized" version? see test illustration below. needless result of flat namespace null both properties. possible solution: re-create info flat.b first on property property basis. note: not prefered option. using system; namespace hierarchy { using protobuf; [protocontract] public class { [protomember(1)] public string prop1 { get; set; } } [protocontract] public class b : { public b() { } [protomember(1)] public string prop2 { get; set; } public override string tostring() { homecoming "prop1=" + prop1 + ", prop2=" + prop2; } } } namespace flat { using protobuf; [protocontract] p...
Read more

javascript - Change element in each JQuery tab to dynamically generated colors -

javascript - Change element in each JQuery tab to dynamically generated colors - i'm using jquery ui tabs widget , have button add together additional tabs. i'm tying each tab markers on map coordinating randomly generated color using function gen_color() { homecoming '#'+(math.random()*0xffffff<<0).tostring(16); } so each tab has color corresponds number of markers of same color on map. i'm trying add together 15x15 block of color within tab's tab left of it's label. right i'm using tabtemplate alternative , trying alter when new tab added: $tabs = $("#tabs").tabs({ tabtemplate: "<li><span class='ui-icon-color' style='background-color:#000000;'></span><a href='#{href}'>#{label}</a> <span class='ui-icon ui-icon-close'>remove tab</span></li>", selected: 0, add: funct...
Read more