Why is output from 'git diff' different than 'git show'? -


i expected git show <commit> , git diff <commit>^ <commit> show changes took place in given commit, see list of changes differs. (see example below.) what's correct understanding of function, then?

yes, i've read man pages

git show

for commits shows log message , textual diff. presents    merge commit in special format produced git diff-tree --cc.

git diff

git diff [--options] <commit> <commit> [--] [<path>...]        view changes between 2 arbitrary <commit>.

e.g.

$ my_commit=7c95d118c9837f801f4e314732c593e25feba3b1

git show , output:

$ git show --name-only $my_commit commit 7c95d118c9837f801f4e314732c593e25feba3b1 merge: 5f308b4 9ef9bd7 author: me <quinesquines@gmail.com> date:   thu apr 23 14:14:58 2015 -0700      merge branch 'develop' of github.com:pic-development/dataraptor develop      conflicts:         app/controllers/application_controller.rb         app/controllers/usage/staff_assignment_controller.rb         app/views/crm/connections/_show.html.erb         app/views/crm/task_builders/_task_builders.html.haml         spec/controllers/contacts_controller_spec.rb         spec/controllers/crm/connections_controller_spec.rb  app/controllers/application_controller.rb app/controllers/usage/staff_assignment_controller.rb app/views/crm/connections/_show.html.erb

git diff , output:

$ git diff --name-only $my_commit^ $my_commit app/assets/javascripts/application/quoting/ng-new-quote.js app/assets/stylesheets/application-layout.css.scss app/assets/stylesheets/application.css app/controllers/application_controller.rb app/controllers/crm/connections_controller.rb app/controllers/usage/staff_assignment_controller.rb app/models/crm/connection.rb app/models/usage/permissions.rb app/views/crm/connections/_show.html.erb app/views/crm/task_builders/_task_builder.html.erb app/views/layouts/application.html.erb app/views/marketing/campaigns/_index.html.haml app/views/marketing/campaigns/_task_builders.html.haml app/views/shared/tab/_agency_management.html.erb app/views/shared/tab/_contracts.html.erb app/views/shared/tab/_help.html.erb app/views/shared/tab/_marketing.html.erb app/views/shared/tab/_my_account.html.erb app/views/shared/tab/_reporting.html.erb app/views/shared/tab/_sales_tools.html.erb app/views/shared/tab/_system_management.html.erb app/views/shared/tab/_underwriting_suitability.html.erb app/views/usage/agent_field_sets/_new_submission_option.html.erb app/views/usage/users/_personal.html.erb vendor/assets/stylesheets/bootstrap-combined.min.css vendor/assets/stylesheets/bootstrap.css vendor/assets/stylesheets/pixel-admin.css vendor/assets/stylesheets/themes.css

you displaying diff of merge commit.

consider example following commits (f being newest one), , you're doing git show f , git diff f^ f (which git diff c f).

a--b--c--f  \      /   d----e

  1. git show shows only files changed in merge commit itself. may include files had merge conflicts manually fixed. not show files modified in 1 of merged branches (so b,c or d,e) , merged cleanly. quote man page (emphasis mine):

    for commits [git show] shows log message , textual diff. presents merge commit in special format produced git diff-tree --cc.

    [git diff-tree --cc] further compresses patch output omitting uninteresting hunks contents in parents have 2 variants , merge result picks 1 of them without modification.

  2. git diff <commit>^ <commit> shows diff of merge commit's first parent , merge commit. since merge commit contains changes both first , second parent, you're shown diff of the entire branch (so in example, commit d , e) merged in commit.


Comments

Post a Comment

Popular posts from this blog

shopping cart - Page redirect not working PHP -

im trying redirect user when click "empty cart". redirect working "add cart" not "empty cart". ideas great. in main .php file set current url seen $current_url = base64_encode("http://$_server[http_host]$_server[request_uri]"); then below cartaction.php file handles actions such "add cart" , "empty cart" <?php session_start(); include_once 'config.php'; //add item in shopping cart if(isset($_post["add"])) { $product_id = $_post["product_id"]; //product id $return_url = base64_decode($_post["return_url"]); //return url $qty = $_post["qty"]; $product = $mysqli->query("select product_name, unit_price, unit_quantity products product_id = '$product_id'"); $obj = $product->fetch_object(); if(!isset($_session['products'])) { $_session['products'] = array(); } if(array_key_exists($product_id...
Read more

php - How to modify a menu to show sub-menus -

i have custom php menu made person, displays categories menu. however, need display subcategories well. tried adding hierarchical parameter didn't work. hoping assistance! here code: <ul> <?php /* categories wp e-commerce products */ $wpec_product_categories = get_terms( 'wpsc_product_category', 'hide_empty=0&parent=0&exclude=298'); $myarray = array(); foreach($wpec_product_categories $wpec_categories){ $myarray[$wpec_categories->term_id]['name'] = $wpec_categories->name; $myarray[$wpec_categories->term_id]['slug'] = $wpec_categories->slug; $myarray[$wpec_categories->term_id]['term_id'] = $wpec_categories->term_id; } foreach($myarray $wpec_categories1){ $wpec_term_name = $wpec_categories1['name']; $wpec_term_slug = $wpec_categories1['slug']; $wpec_term_id = $wpec_categories1['term_id']; echo '<li> <a href="'.get_page_link(19)....
Read more

python - Installing PyDev in eclipse is failed -

unable read repository @ http://pydev.sf.net/updates/content.xml. sun.security.validator.validatorexception: pkix path building failed: sun.security.provider.certpath.suncertpathbuilderexception: unable find valid certification path requested target i installing pydev in eclipse using python, doesn't install successfully. gives above error. happened? how solve error? i had error when trying install on laptop behind corporate firewall. couldn't tell setup of firewall, not sure of root cause. i got passed error installing pydev eclipse when out behind firewall. another way got around have eclipse on non-firewalled machine, install pydev eclipse, , copy whole eclipse directory non-firewalled machine firewalled machine. there better way, , way fix properly, didn't have time work out firewall doing. this on windows 7 machine (yeah know) not work *nix versions installed through package manager yum or apt.
Read more