version control - Can git do a diff between a repo file and an external (non-repo) file? -


i need diff between version of myfile in master~2, , copy of myfile exists outside repository (say d:\folder\myfile).

the wording in git-diff under --no-index says:

git diff --no-index [--options] [--] […]

this form compare given 2 paths on filesystem. can omit --no-index option when running command in working tree controlled git , at least 1 of paths points outside working tree

the wording "at least one" seems imply comparison can done between 1 repo file , 1 non-repo file, in practice: 

$ git diff master~2:myfile d:/folder/myfile   error: not access: 'master~2:myfile'  $ git diff master~2:myfile -- d:/folder/myfile   fatal: d:/folder/myfile: 'd:/folder/myfile' outside repository    $ git diff --no-index master~2:myfile -- d:/folder/myfile   usage: git diff --no-index <path> <path>

what easiest way achieve comparison?

without using git-diff, found indirect way of achieving - method given in this blog post, using external file original "current file", , making sure have repo directory current-directory before doing git show.

the steps involved are:

  1. open external non-repo file in vim usual way
  2. do :vsp new vertically split new (blank) window
  3. :cd working directory of git repository
  4. :read !git show master~2:myfile read contents of myfile 2 commits ago
  5. setf yourfiletypehere syntax highlighting (optional)
  6. :diffthis in 1 window, switch other window , run :diffthis again, , have diff

Comments

Post a Comment

Popular posts from this blog

Magento/PHP - Get phones on all members in a customer group -

i working on custom magento extension. working around adminhtml part , i've created custom form there. here form code: <?php class vivasindustries_smsnotification_block_adminhtml_sms_sendmass_edit_form extends mage_adminhtml_block_widget_form { public function _preparelayout() { $extensionpath = mage::getmoduledir('js', 'vivasindustries_smsnotification'); $head = $this->getlayout()->getblock('head'); $head->addjs('jquery.js'); $head->addjs('vivas.js'); return parent::_preparelayout(); } protected function _prepareform() { $form = new varien_data_form(array( 'id' => 'edit_form', 'action' => $this->geturl('*/*/save', array('id' => $this->getrequest()->get...
Read more

php - Bypass Geo Redirect for specific directories -

i'm trying bypass redirect specific url within site. wondering if might able help. the code below code use, original urls replaces example.com i'd able access http://example.com/admin without redirect occuring. is there way this, , there way using own ip? function country_geo_redirect() { $country = getenv('http_geoip_country_code'); if ($country == "us" ) { wp_redirect("http://usa.example.com/"); exit; } else if ($country == "gb" ) { wp_redirect("http://uk.example.com/"); exit; } } add_action('init', 'country_geo_redirect'); you can bypass redirection code if server found ip address. if ip address == <my ip address> ' nothing here else country_georedirect() end if
Read more

php - .htaccess mod_rewrite for dynamic url which has domain names -

i want convert url ex:( example.com/link.php?url=facebook.com ) ( example.com/facebook.com.php ) how can using .htaccess. or there other process make job easier ? i tried adding script .htaccess file options +followsymlinks rewriteengine on rewriterule url-(.*)\.htm$ link.php?url=$1 but converting url adding "url-" ( example.com/url-facebook.com.php ) i want remove "url-" , want make ( example.com/facebook.com.php ) rewriteengine on rewritecond %{the_request} ^get.*link\.php\?url\= [nc] rewritecond %{request_uri} !/system/.* [nc] rewriterule (.*?)link\.php\?url\=/*(.*) /$1$2 [r=301,ne,l] not sure how above work edit of used use remove index.php url
Read more