git - find a branching off point for repo-less code -



git - find a branching off point for repo-less code -

i have rails plugin copied git repo script/plugin install @ point. later, local patches added it. want maintain code separate branch in fork of original plugin's own repo.

given git repo , code tree, what's way find commit closest new code, e.g. minimizing total amount of diff lines?

if can recover timestamp when cloned repo, commit closest , branch there. otherwise, going have hairy time.

you asking minimum edit distance between code , git repo, np-hard problem, , bad 1 in case since need tree diffs , edit distance of each git blob (that is, code files , other objects).

you seek find needle in haystack help of git-tree-diff, first cloning repo of plugin, making branch, committing changes on top of it. tree-diff allow assess difference, you'd have repeat every commit, , hell.

instead, take current code, above can 1 huge diff master's head of plugin repo, seek split changes many atomic commits can.

it'll hurt, might see end of it.

edit: here alternative may prove tractable, albeit still annoying. since have history , can earliest version, can calculate git hash blobs "original" files , find them in history of owner's repo. in history, check out plugin before made changes. allow calculate blob hash individual file , content. can search through git history on official repo blob hashes find. identify @ point, @ commit, plugin file @ when installed it. can compare , find oldest commit.

the kernel.org git docs provide illustration this:

git log --raw --abbrev=40 --pretty=oneline | grep -b 1 `git hash-object filename`

this find commit w/ hash, author, , timestamp. seek think of way of farther automating easily.

git ruby-on-rails-plugins

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

intellij idea - Update external libraries with intelij and java -

intellij idea - Update external libraries with intelij and java - simple plenty really. i'm using apache jars, i'll create changes jar's every often. these jars listed external libs in intelij (i.e classpath looking install dir of jar's). when create changes intelij doesn't seem know new implementation. have remove jar external library , re-ad it. does know have intelij picks changes automatically ? i've done clean , rebuild project had little effect. you can go preferences -> build, execution, deployment -> build tools -> maven -> importing , check box says import maven projects automatically . in mac, can command + shift + a , come in action reimport , click on reimport maven projects . intellij-idea
Read more

javascript - send data from a new window to previous window in php -

javascript - send data from a new window to previous window in php - i have image in main.php file : <img src="..\images\image.gif" class="cur" onclick="imgwin();"> when click on image below function has called : function imgwin() { imagewin=window.open("../pages/img.php","imagewin","toolbar=no,width=500,height=200,directories=no,menubar=no,scrollbars=yes"); } this function opens img.php in new window img.php file : <html> <head> <title>upload image</title> </head> <body> <form name="imgform" method="get" action="#"> address : <input type="file" name="imgurl" size="50"> description : <input type="text" name="description" size="50"> <input type="submit" value="sumbit...
Read more